# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1519639303 -3600
# Node ID 0686e05d4ad34c51348b8c011bf2bc4a6d3fc733
# Parent  9b57fc6405787b6d80ad3144d5a85e3a3152f0c0
ipxe: fix ipxe.cmd

diff -r 9b57fc640578 -r 0686e05d4ad3 etherboot/receipt
--- a/etherboot/receipt	Sun Feb 25 17:56:27 2018 +0100
+++ b/etherboot/receipt	Mon Feb 26 11:01:43 2018 +0100
@@ -39,14 +39,14 @@
 # Pre and post install commands for Tazpkg.
 post_install()
 {
-	echo "----"
-	echo "You can create pxe/nbi boot floppy with:"
-	echo "# cp /usr/share/boot/etherboot /dev/fd0"
-	echo "----"
 	[ -s $1/boot/isolinux/isolinux.cfg ] &&
 	! grep -qs 'Web Boot' $1/boot/isolinux/isolinux.cfg &&
 	sed -i 's|i18n.cfg|&\n\
 LABEL web zeb\
 	MENU LABEL Web Boot\
 	KERNEL /boot/etherboot|' $1/boot/isolinux/isolinux.cfg
+	echo "----"
+	echo "You can create pxe/nbi boot floppy with:"
+	echo "# cp /usr/share/boot/etherboot /dev/fd0"
+	echo "----"
 }
diff -r 9b57fc640578 -r 0686e05d4ad3 gpxe/receipt
--- a/gpxe/receipt	Sun Feb 25 17:56:27 2018 +0100
+++ b/gpxe/receipt	Mon Feb 26 11:01:43 2018 +0100
@@ -50,4 +50,5 @@
 LABEL web zeb\
 	MENU LABEL Web Boot\
 	KERNEL /boot/gpxe|' $1/boot/isolinux/isolinux.cfg
+	true
 }
diff -r 9b57fc640578 -r 0686e05d4ad3 ipxe/receipt
--- a/ipxe/receipt	Sun Feb 25 17:56:27 2018 +0100
+++ b/ipxe/receipt	Mon Feb 26 11:01:43 2018 +0100
@@ -66,4 +66,5 @@
 LABEL web zeb\
 	MENU LABEL Web Boot\
 	KERNEL /boot/ipxe.exe|' $1/boot/isolinux/isolinux.cfg
+	true
 }
diff -r 9b57fc640578 -r 0686e05d4ad3 ipxe/stuff/ipxe.cmd
--- a/ipxe/stuff/ipxe.cmd	Sun Feb 25 17:56:27 2018 +0100
+++ b/ipxe/stuff/ipxe.cmd	Mon Feb 26 11:01:43 2018 +0100
@@ -8,15 +8,19 @@
 menu SliTaz net boot menu
 item --key b boot	Local boot
 item --gap
+item --gap Configuration
+item --key e exit	iPXE command line
+item --key c config	iPXE configuration
+isset ${ip} || goto noip
+item --gap
 item --gap Network boot
-isset ${filename} && item --key l lan	Your PXE boot ${filename}
+isset ${filename} && item --key l lan	Your PXE boot ${filename} ||
 item --key w web	SliTaz WEB boot
 item --key r rolling	SliTaz development version
-item --gap
-item --gap Configuration
-isset ${ip} || item --key i ipset	IP settings
-item --key c config	iPXE configuration
-item --key e exit	iPXE command line
+goto endip
+:noip
+item --key i ipset	IP settings
+:endip
 choose --timeout ${menu-timeout} --default web target || goto exit
 set menu-timeout 0
 isset ${dns} || set dns 8.8.8.8
@@ -40,7 +44,6 @@
 goto menu
 
 :web
-isset ${ip} || dhcp || echo No DHCP
 imgfree
 set weburl http://mirror.slitaz.org/pxe/
 chain --autofree ${weburl}ipxe/menu.ipxe && boot ||
@@ -57,12 +60,10 @@
 goto menu
 
 :lan
-isset ${ip} || dhcp || echo No DHCP
 autoboot ||
 goto menu
 
 :rolling
-isset ${ip} || dhcp || echo No DHCP
 sanboot http://mirror.slitaz.org/iso/rolling/slitaz-rolling.iso ||
 goto menu
 
diff -r 9b57fc640578 -r 0686e05d4ad3 memtest-serial/receipt
--- a/memtest-serial/receipt	Sun Feb 25 17:56:27 2018 +0100
+++ b/memtest-serial/receipt	Mon Feb 26 11:01:43 2018 +0100
@@ -20,14 +20,14 @@
 # Pre and post install commands for Tazpkg.
 post_install()
 {
-	cat <<EOT
-
-Output to vga and serial port. Default kernel cmdline: console=ttyS0,115200e8
-EOT
 	[ -s $1/boot/isolinux/isolinux.cfg ] &&
 	! grep -qs 'Check memory' $1/boot/isolinux/isolinux.cfg && sed -i \
 's|LABEL md5|LABEL memtest mem ram\
 	MENU LABEL Check memory\
 	KERNEL /boot/memtest.exe\
 \n&|' $1/boot/isolinux/isolinux.cfg
+	cat <<EOT
+
+Output to vga and serial port. Default kernel cmdline: console=ttyS0,115200e8
+EOT
 }
diff -r 9b57fc640578 -r 0686e05d4ad3 memtest/receipt
--- a/memtest/receipt	Sun Feb 25 17:56:27 2018 +0100
+++ b/memtest/receipt	Mon Feb 26 11:01:43 2018 +0100
@@ -57,4 +57,5 @@
 	MENU LABEL Check memory\
 	KERNEL /boot/memtest.exe\
 \n&|' $1/boot/isolinux/isolinux.cfg
+	true
 }