# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1453560300 -3600
# Node ID 5dd6b4855dfe90943fe7c96dd92b324effaa2578
# Parent  f97458b736908d2ccdabe21c24823b32cc2ab820
webboot: switch from pxelinux to ipxe

diff -r f97458b73690 -r 5dd6b4855dfe mirror/root/ipxe/menu.ipxe
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mirror/root/ipxe/menu.ipxe	Sat Jan 23 15:45:00 2016 +0100
@@ -0,0 +1,108 @@
+#!ipxe
+
+set menu-timeout 3000
+#set mirror http://mirror.slitaz.org/
+#set mirror http://mirror1.slitaz.org/
+set mirror http://mirror2.slitaz.org/
+set mirror http://mirror.switch.ch/ftp/mirror/slitaz/
+#set mirror http://mirror3.slitaz.org/
+#set mirror http://download.tuxfamily.org/slitaz/
+
+console --picture /pxe/ipxe/slitaz.png
+
+:menu
+menu SliTaz Web boot
+item --key r rolling SliTaz rolling (last weekly build)
+item --key s stable SliTaz stable
+item allslitaz All SliTaz versions -->
+item --gap
+item --gap Web boot ring:
+item pxelinux SliTaz pxelinux web boot
+item bko http://boot.kernel.org/ [down]
+item netbootme http://www.netboot.me/ [hang]
+item salstar http://boot.salstar.sk/
+item netbootxyz http://netboot.xyz/ (more tools)
+item --gap
+item --gap Tools:
+item tazfd SliTaz boot floppy
+item localos Local disk OS
+item misc Third party tools -->
+item --gap
+item --gap Leave web boot:
+item local Boot from your hard disk
+item reboot Reboot
+choose --timeout ${menu-timeout} --default rolling target || goto exit
+set menu-timeout 0
+goto ${target}
+
+:exit
+help
+echo Type 'exit' to get back to the menu
+shell
+goto menu
+
+:rolling
+sanboot http://mirror1.slitaz.org/iso/rolling/slitaz-rolling.iso ||
+sanboot ${mirror}iso/rolling/slitaz-rolling.iso ||
+goto menu
+
+:stable
+sanboot ${mirror}iso/stable/slitaz-4.0.iso ||
+goto menu
+
+:allslitaz
+chain --autofree /pxe/ipxe/slitaz.ipxe
+goto menu
+
+:localos
+chain /pxe/grub.exe
+goto menu
+
+:pxelinux
+imgfree
+kernel /boot/gpxe url=${mirror}pxe/pxelinux.0,http://mirror.switch.ch/ftp/mirror/pxe/pxelinux.0,http://download.tuxfamily.org/slitaz/pxe/pxelinux.0
+boot
+goto menu
+
+:bko
+imgfree
+kernel /boot/gpxe url=http://boot.kernel.org/bko/pxelinux.0,http://boot.rit.edu/bko/pxelinux.0
+boot
+goto menu
+
+:netbootme
+imgfree
+kernel /pxe/netboot.me
+boot
+goto menu
+
+:salstar
+imgfree
+kernel http://boot.salstar.sk/ipxe/ipxe.lkrn
+boot
+goto menu
+
+:netbootxyz
+chain --autofree http://boot.netboot.xyz/menu.ipxe
+goto menu
+
+:tazfd
+imgfree
+kernel /pxe/memdisk
+initrd /boot/floppy-grub4dos
+boot
+goto menu
+
+:misc
+chain --autofree /pxe/ipxe/tools.ipxe
+goto menu
+
+:local
+imgfree
+kernel /pxe/grub.exe --config-file="chainloader (hd0)+1 || chainloader (hd1)+1"
+boot
+goto menu
+
+:reboot
+reboot ||
+goto menu
diff -r f97458b73690 -r 5dd6b4855dfe mirror/root/ipxe/slitaz.ipxe
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mirror/root/ipxe/slitaz.ipxe	Sat Jan 23 15:45:00 2016 +0100
@@ -0,0 +1,184 @@
+#!ipxe
+
+set menu-timeout 3000
+#set mirror http://mirror.slitaz.org/
+#set mirror http://mirror1.slitaz.org/
+set mirror http://mirror2.slitaz.org/
+set mirror http://mirror.switch.ch/ftp/mirror/slitaz/
+#set mirror http://mirror3.slitaz.org/
+#set mirror http://download.tuxfamily.org/slitaz/
+
+:menu
+menu SliTaz Web boot
+item --key q return ..
+item --gap
+item --gap Tiny SliTaz: see http://tiny.slitaz.org/
+item --key t tiny Tiny SliTaz -->
+item --gap
+item --gap SliTaz pre-1.0:
+item vintage SliTaz 04/12/2007
+item --gap
+item --gap SliTaz 1.0: released 22/03/2008
+item core1 Slitaz 1.0 standard
+item loram1 Slitaz 1.0 loram
+item tiny1 Slitaz 1.0 tiny
+item --gap
+item --gap SliTaz 2.0: released 16/04/2009
+item core2 Slitaz 2.0 standard
+item loram2 Slitaz 2.0 loram
+item tiny2 Slitaz 2.0 tiny
+item tinytext2 Slitaz 2.0 tiny text
+item --gap
+item --gap SliTaz 3.0: released 28/03/2010
+item core3 Slitaz 3.0 standard
+item loram3 Slitaz 3.0 loram
+item firefox3 Slitaz 3.0 firefox
+item tiny3 Slitaz 3.0 tiny
+item tinytext3 Slitaz 3.0 tiny text
+item --gap
+item --gap SliTaz 4.0: released 10/04/2012
+item core4 Slitaz 4.0 standard
+item loram4 Slitaz 4.0 loram
+item firefox4 Slitaz 4.0 firefox
+item kids4 Slitaz 4.0 kids
+item tiny4 Slitaz 4.0 tiny
+item tinytext4 Slitaz 4.0 tiny text
+item --gap
+item --gap SliTaz 5.0
+item core5RC1 Slitaz 5.0 RC1 02/05/2014
+item core5RC2 Slitaz 5.0 RC2 19/05/2014
+item core5RC3 Slitaz 5.0 RC3 20/05/2015
+item --gap
+item --gap SliTaz rolling
+item rolling10 Slitaz rolling 10in1 (autoselect 32bits or 64bits arch)
+item rolling64 Slitaz rolling 64 bits (no 32bits arch support)
+item rollingloram Slitaz rolling loram
+choose --timeout ${menu-timeout} target || goto exit
+set menu-timeout 0
+goto ${target}
+
+:return
+chain --autofree /pxe/ipxe/menu.ipxe
+
+:tiny
+chain --autofree /pxe/ipxe/tiny.ipxe
+goto menu
+
+:vintage
+sanboot ${mirror}iso/vintage/slitaz-cooking-20071204.iso ||
+goto menu
+
+:core1
+sanboot ${mirror}iso/1.0/flavors/slitaz-1.0-4in1.iso ||
+goto menu
+
+:loram1
+sanboot ${mirror}iso/1.0/flavors/slitaz-loram-1.0.iso ||
+goto menu
+
+:tiny1
+sanboot ${mirror}iso/1.0/flavors/slitaz-tiny-1.0.iso ||
+goto menu
+
+:core2
+sanboot ${mirror}iso/2.0/flavors/slitaz-2.0-3in1.iso ||
+goto menu
+
+:loram2
+sanboot ${mirror}iso/2.0/flavors/slitaz-loram.iso ||
+goto menu
+
+:tiny2
+imgfree
+kernel ${mirror}boot/2.0/bzImage rw root=/dev/null vga=normal autologin
+initrd ${mirror}boot/2.0/rootfs-tiny.gz
+boot
+goto menu
+
+:tinytext2
+imgfree
+kernel ${mirror}boot/2.0/bzImage rw root=/dev/null vga=normal screen=text
+initrd ${mirror}boot/2.0/rootfs-tiny.gz
+boot
+goto menu
+
+:core3
+sanboot ${mirror}iso/3.0/flavors/slitaz-3.0-3in1.iso ||
+goto menu
+
+:loram3
+sanboot ${mirror}iso/3.0/flavors/slitaz-3.0-loram.iso ||
+goto menu
+
+:firefox3
+sanboot ${mirror}iso/3.0/flavors/slitaz-3.0-firefox.iso ||
+goto menu
+
+:tiny3
+imgfree
+kernel ${mirror}boot/3.0/bzImage rw root=/dev/null vga=normal autologin
+initrd ${mirror}boot/3.0/rootfs-tiny.gz
+boot
+goto menu
+
+:tinytext3
+imgfree
+kernel ${mirror}boot/3.0/bzImage rw root=/dev/null vga=normal screen=text
+initrd ${mirror}boot/3.0/rootfs-tiny.gz
+boot
+goto menu
+
+:core4
+sanboot ${mirror}iso/4.0/slitaz-4.0.iso ||
+goto menu
+
+:loram4
+sanboot ${mirror}iso/4.0/flavors/slitaz-4.0-loram.iso ||
+goto menu
+
+:firefox4
+sanboot ${mirror}iso/4.0/flavors/slitaz-4.0-firefox.iso ||
+goto menu
+
+:kids4
+sanboot ${mirror}iso/4.0/flavors/slitaz-4.0-kids.iso ||
+goto menu
+
+:tiny4
+imgfree
+kernel ${mirror}boot/4.0/bzImage rw root=/dev/null vga=normal autologin
+initrd ${mirror}boot/4.0/rootfstiny.gz
+boot
+goto menu
+
+:tinytext4
+imgfree
+kernel ${mirror}boot/4.0/bzImage rw root=/dev/null vga=normal screen=text
+initrd ${mirror}boot/4.0/rootfstiny.gz
+boot
+goto menu
+
+:core5RC1
+sanboot ${mirror}iso/5.0/slitaz-5.0-rc1.iso ||
+goto menu
+
+:core5RC2
+sanboot ${mirror}iso/5.0/slitaz-5.0-rc2.iso ||
+goto menu
+
+:core5RC3
+sanboot ${mirror}iso/5.0/slitaz-5.0-rc3.iso ||
+goto menu
+
+:rolling10
+sanboot ${mirror}iso/rolling/slitaz-rolling-10in1.iso ||
+goto menu
+
+:rolling64
+sanboot ${mirror}iso/rolling/slitaz-rolling-core64.iso ||
+goto menu
+
+:rollingloram
+sanboot ${mirror}iso/rolling/slitaz-rolling-loram.iso ||
+goto menu
+
diff -r f97458b73690 -r 5dd6b4855dfe mirror/root/ipxe/slitaz.png
Binary file mirror/root/ipxe/slitaz.png has changed
diff -r f97458b73690 -r 5dd6b4855dfe mirror/root/ipxe/tiny.ipxe
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mirror/root/ipxe/tiny.ipxe	Sat Jan 23 15:45:00 2016 +0100
@@ -0,0 +1,39 @@
+#!ipxe
+
+set menu-timeout 3000
+
+:menu
+menu Tiny SliTaz Web boot (needs a 386sx with 8Mb)
+item --key q return ..
+item --gap
+item --key u tinyus Tiny Slitaz (us)
+item --key f tinyfr Tiny Slitaz (fr)
+item --key v tinyvnc Tiny VNC
+choose --timeout ${menu-timeout} target || goto exit
+set menu-timeout 0
+goto ${target}
+
+:tinyus
+imgfree
+kernel /pxe/tiny/bzImage.gz
+initrd /pxe/tiny/rootfs.gz
+boot
+goto menu
+
+:tinyfr
+imgfree
+kernel /pxe/tiny/bzImage.gz
+initrd /pxe/tiny/rootfs-fr.gz
+boot
+goto menu
+
+:tinyvnc
+imgfree
+kernel /pxe/tiny/vnc/bzImage.gz vga=ask
+initrd /pxe/tiny/vnc/rootfs.gz
+boot
+goto menu
+
+:return
+chain --autofree /pxe/ipxe/menu.ipxe
+goto menu
diff -r f97458b73690 -r 5dd6b4855dfe mirror/root/ipxe/tools.ipxe
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mirror/root/ipxe/tools.ipxe	Sat Jan 23 15:45:00 2016 +0100
@@ -0,0 +1,35 @@
+#!ipxe
+
+set menu-timeout 3000
+
+:menu
+menu SliTaz Web boot
+item --key q return ..
+item --gap
+item --gap Third party tools:
+item memtest Memtest86+
+item memtest4 Memtest86+ 4.20
+item ubcd535 Universal boot CD version 5.3.5
+choose --timeout ${menu-timeout} target || goto exit
+set menu-timeout 0
+goto ${target}
+
+:memtest4
+imgfree
+kernel /pxe/memtest-4.20
+boot
+goto menu
+
+:memtest
+imgfree
+kernel /pxe/memtest
+boot
+goto menu
+
+:ubcd535
+sanboot http://cdn.removed.us/ubcd/ubcd535.iso ||
+goto menu
+
+:return
+chain --autofree /pxe/ipxe/menu.ipxe
+goto menu
diff -r f97458b73690 -r 5dd6b4855dfe mirror/root/pxe/defaults.cfg
--- a/mirror/root/pxe/defaults.cfg	Tue Jan 19 22:09:42 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-default menu.c32
-prompt 0
-
-MENU TITLE Slitaz Web boot                                       http://www.slitaz.org/
-ALLOWOPTIONS 0
-MENU MARGIN 0
-MENU ROWS 17
-MENU COLOR BORDER       37;44 #40000000 #00000000 std
-MENU COLOR TITLE      1;33;44 #c00090f0 #00000000 std
-MENU COLOR SCROLLBAR    37;44 #40000000 #00000000 std
-
-#MENU COLOR TIMEOUT_MSG 1;33;44 #c00090f0 #00000000 std
-#MENU COLOR TIMEOUT       37;40 #80ffffff #00000000 std
-MENU TIMEOUTROW 25
-MENU AUTOBOOT Start cooking in # second{,s}
-timeout 100
-TOTALTIMEOUT 9000
diff -r f97458b73690 -r 5dd6b4855dfe mirror/root/pxe/mkcfg.sh
--- a/mirror/root/pxe/mkcfg.sh	Tue Jan 19 22:09:42 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,176 +0,0 @@
-#!/bin/sh
-
-#usage:
-# copy /boot/isolinux/* <version>
-# remove *.cfg
-# copy then update /boot/isolinux/isolinux.cfg <version>core.cfg
-
-cd $(dirname $0)
-
-# Status functions.
-status()
-{
-	local CHECK=$?
-	echo -en "\\033[70G[ "
-	if [ $CHECK = 0 ]; then
-		echo -en "\\033[1;33mOK"
-	else
-		echo -en "\\033[1;31mFailed"
-	fi
-        echo -e "\\033[0;39m ]"
-}
-
-directlinks()
-{
-	mkdir $1/$2
-	ln -s .. $1/$2/$1
-	ln -s ../$2.cfg $1/$2/default
-	ln -s ../../pxelinux.0 $1/$2/pxelinux.0
-	ln -s . $1/$2/pxelinux.cfg
-	[ -e $1/boot ] || ln -s ../../boot $1/boot
-}
-for version in cooking $(ls ../boot | grep 0$) ; do
-
-[ "$version" = "1.0" ] && continue
-echo -n "Building $version"
-for i in splash.lss isolinux.msg core.cfg ; do
-	[ -s $version/$i ] && continue
-	echo -n " $version/$i not found !"
-	false
-	status
-	continue 2
-done
-if ! grep -q $version/splash.lss $version/isolinux.msg ; then
-	echo "WARNING: please update $version/isolinux.msg with $version/splash.lss"
-fi
-rm -f $version/*-*.cfg
-( cd ../boot/$version ; ls rootfs-*.gz 2> /dev/null ) | \
-sed 's/rootfs-\(.*\).gz/\1/' | while read flavor; do
-	lowcased=$(echo $flavor | tr [A-Z] [a-z])
-	if [ "$lowcased" != "$flavor" ]; then
-		echo ""
-		echo "Warning : renaming ../boot/$version/rootfs-$flavor.gz to ../boot/$version/rootfs-$lowcased.gz"
-		mv ../boot/$version/rootfs-$flavor.gz ../boot/$version/rootfs-$lowcased.gz
-		flavor=$lowcased
-	fi
-    	[ -f $version/$flavor.cfg ] && continue
-        cp $version/core.cfg $version/$flavor.cfg
-	sed -i -e "s/core-common/$flavor-common/" \
-	       -e "s/^label slitaz$/say Using $flavor flavor.\nlabel slitaz/" \
-	       -e "s/rootfs.gz/rootfs-$flavor.gz/" $version/$flavor.cfg
-	directlinks $version $flavor
-done
-for flavor in $(cd $version ; ls *.cfg | sed 's/.cfg//') ; do
-  echo -n " $flavor"
-  cat > $version/$flavor-common.cfg <<EOT
-default slitaz
-label deCH
-	config $version/$flavor-de_CH.cfg
-label frCH
-	config $version/$flavor-fr_CH.cfg
-label reboot
-	com32 reboot.c32
-
-implicit 0	
-prompt 1	
-timeout 80
-F1 $version/help.txt
-F2 $version/options.txt
-F3 $version/isolinux.msg
-F4 $version/display.txt
-F5 $version/enhelp.txt
-F6 $version/enopts.txt
-
-EOT
-  while read cfg kbd loc ; do
-    if [ ! -f $version/$cfg.kbd ]; then
-    	echo ""
-	echo "Not found: $version/$cfg.kbd"
-    fi
-    info="Now using $kbd keyboard and $loc locale."
-    sed -e "s/^display/kbdmap $version\/$cfg.kbd\ndisplay/" \
-        -e "s/^label slitaz$/say $info\nlabel slitaz/" \
-        -e "s/gz/gz lang=$loc kmap=$kbd/" \
-        < $version/$flavor.cfg > $version/$flavor-$cfg.cfg
-    cat >> $version/$flavor-common.cfg <<EOT
-label $cfg
-	config $version/$flavor-$cfg.cfg
-EOT
-  done <<EOT
-be    be-latin1    fr_FR
-br    br-abnt2     pt_PT
-ca    cf           fr_FR
-de    de-latin1    de_DE
-de_CH de_CH-latin1 de_DE
-en    uk           C
-es    es           es_ES
-fi    fi-latin1    fi
-fr    fr-latin1    fr_FR
-fr_CH fr_CH-latin1 fr_FR
-hu    hu           hu
-it    it           it_IT
-jp    jp106        jp_JP
-pt    pt-latin1    pt_PT
-ru    ru           ru_RU
-us    us           C
-EOT
-done
-status
-
-done
-
-echo -n "Building 1.0"
-rm -f 1.0/*-*.cfg
-( cd ../boot/1.0 ; ls rootfs-*.gz 2> /dev/null ) | \
-sed 's/rootfs-\(.*\).gz/\1/' | while read flavor; do
-    	[ -f 1.0/$flavor.cfg ] && continue
-        cp 1.0/core.cfg 1.0/$flavor.cfg
-	sed -i -e "s/core-common/$flavor-common/" \
-	       -e "s/rootfs.gz/rootfs-$flavor.gz/" 1.0/$flavor.cfg
-	directlinks 1.0 $flavor
-done
-directlinks 1.0 core
-for flavor in $(cd 1.0; ls *.cfg | sed 's/.cfg//') ; do
-  echo -n " $flavor"
-  cat > 1.0/$flavor-common.cfg <<EOT
-default slitaz
-
-label def
-	config 1.0/$flavor.cfg
-
-label reboot
-	com32 reboot.c32
-
-implicit 0	
-prompt 1	
-timeout 80
-F1 1.0/help.txt
-F2 1.0/options.txt
-F3 1.0/isolinux.msg
-F4 1.0/display.txt
-EOT
-  while read cfg kbd loc ; do
-    if [ ! -f 1.0/$cfg.kbd ]; then
-    	echo ""
-	echo "Not found: 1.0/$cfg.kbd"
-    fi
-    sed -e "s/^display/KBDMAP 1.0\/$cfg.kbd\ndisplay/" \
-        -e "s/gz/gz lang=$loc kmap=$kbd/" \
-        < 1.0/$flavor.cfg > 1.0/$flavor-$cfg.cfg
-    cat >> 1.0/$flavor-common.cfg <<EOT
-label $cfg
-	config 1.0/$flavor-$cfg.cfg
-EOT
-  done <<EOT
-be    be    fr
-ca    ca    fr
-de_CH fr_CH fr_CH
-en    en    en
-es    es    en
-fr    fr    fr
-fr_CH fr_CH fr_CH
-it    it    en
-us    us    en
-EOT
-done
-status
diff -r f97458b73690 -r 5dd6b4855dfe mirror/root/pxe/pxelinux.cfg/default
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mirror/root/pxe/pxelinux.cfg/default	Sat Jan 23 15:45:00 2016 +0100
@@ -0,0 +1,5 @@
+default ipxe
+say Switching to IPXE configuration...
+
+label ipxe
+	kernel http://mirror1.slitaz.org/pxe/ipxe2016