wok-6.x rev 20219
ipxe: fix ipxe.cmd
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Mon Feb 26 11:01:43 2018 +0100 (2018-02-26) |
| parents | 9b57fc640578 |
| children | 34b98ca981a1 |
| files | etherboot/receipt gpxe/receipt ipxe/receipt ipxe/stuff/ipxe.cmd memtest-serial/receipt memtest/receipt |
line diff
1.1 --- a/etherboot/receipt Sun Feb 25 17:56:27 2018 +0100 1.2 +++ b/etherboot/receipt Mon Feb 26 11:01:43 2018 +0100 1.3 @@ -39,14 +39,14 @@ 1.4 # Pre and post install commands for Tazpkg. 1.5 post_install() 1.6 { 1.7 - echo "----" 1.8 - echo "You can create pxe/nbi boot floppy with:" 1.9 - echo "# cp /usr/share/boot/etherboot /dev/fd0" 1.10 - echo "----" 1.11 [ -s $1/boot/isolinux/isolinux.cfg ] && 1.12 ! grep -qs 'Web Boot' $1/boot/isolinux/isolinux.cfg && 1.13 sed -i 's|i18n.cfg|&\n\ 1.14 LABEL web zeb\ 1.15 MENU LABEL Web Boot\ 1.16 KERNEL /boot/etherboot|' $1/boot/isolinux/isolinux.cfg 1.17 + echo "----" 1.18 + echo "You can create pxe/nbi boot floppy with:" 1.19 + echo "# cp /usr/share/boot/etherboot /dev/fd0" 1.20 + echo "----" 1.21 }
2.1 --- a/gpxe/receipt Sun Feb 25 17:56:27 2018 +0100 2.2 +++ b/gpxe/receipt Mon Feb 26 11:01:43 2018 +0100 2.3 @@ -50,4 +50,5 @@ 2.4 LABEL web zeb\ 2.5 MENU LABEL Web Boot\ 2.6 KERNEL /boot/gpxe|' $1/boot/isolinux/isolinux.cfg 2.7 + true 2.8 }
3.1 --- a/ipxe/receipt Sun Feb 25 17:56:27 2018 +0100 3.2 +++ b/ipxe/receipt Mon Feb 26 11:01:43 2018 +0100 3.3 @@ -66,4 +66,5 @@ 3.4 LABEL web zeb\ 3.5 MENU LABEL Web Boot\ 3.6 KERNEL /boot/ipxe.exe|' $1/boot/isolinux/isolinux.cfg 3.7 + true 3.8 }
4.1 --- a/ipxe/stuff/ipxe.cmd Sun Feb 25 17:56:27 2018 +0100 4.2 +++ b/ipxe/stuff/ipxe.cmd Mon Feb 26 11:01:43 2018 +0100 4.3 @@ -8,15 +8,19 @@ 4.4 menu SliTaz net boot menu 4.5 item --key b boot Local boot 4.6 item --gap 4.7 +item --gap Configuration 4.8 +item --key e exit iPXE command line 4.9 +item --key c config iPXE configuration 4.10 +isset ${ip} || goto noip 4.11 +item --gap 4.12 item --gap Network boot 4.13 -isset ${filename} && item --key l lan Your PXE boot ${filename} 4.14 +isset ${filename} && item --key l lan Your PXE boot ${filename} || 4.15 item --key w web SliTaz WEB boot 4.16 item --key r rolling SliTaz development version 4.17 -item --gap 4.18 -item --gap Configuration 4.19 -isset ${ip} || item --key i ipset IP settings 4.20 -item --key c config iPXE configuration 4.21 -item --key e exit iPXE command line 4.22 +goto endip 4.23 +:noip 4.24 +item --key i ipset IP settings 4.25 +:endip 4.26 choose --timeout ${menu-timeout} --default web target || goto exit 4.27 set menu-timeout 0 4.28 isset ${dns} || set dns 8.8.8.8 4.29 @@ -40,7 +44,6 @@ 4.30 goto menu 4.31 4.32 :web 4.33 -isset ${ip} || dhcp || echo No DHCP 4.34 imgfree 4.35 set weburl http://mirror.slitaz.org/pxe/ 4.36 chain --autofree ${weburl}ipxe/menu.ipxe && boot || 4.37 @@ -57,12 +60,10 @@ 4.38 goto menu 4.39 4.40 :lan 4.41 -isset ${ip} || dhcp || echo No DHCP 4.42 autoboot || 4.43 goto menu 4.44 4.45 :rolling 4.46 -isset ${ip} || dhcp || echo No DHCP 4.47 sanboot http://mirror.slitaz.org/iso/rolling/slitaz-rolling.iso || 4.48 goto menu 4.49
5.1 --- a/memtest-serial/receipt Sun Feb 25 17:56:27 2018 +0100 5.2 +++ b/memtest-serial/receipt Mon Feb 26 11:01:43 2018 +0100 5.3 @@ -20,14 +20,14 @@ 5.4 # Pre and post install commands for Tazpkg. 5.5 post_install() 5.6 { 5.7 - cat <<EOT 5.8 - 5.9 -Output to vga and serial port. Default kernel cmdline: console=ttyS0,115200e8 5.10 -EOT 5.11 [ -s $1/boot/isolinux/isolinux.cfg ] && 5.12 ! grep -qs 'Check memory' $1/boot/isolinux/isolinux.cfg && sed -i \ 5.13 's|LABEL md5|LABEL memtest mem ram\ 5.14 MENU LABEL Check memory\ 5.15 KERNEL /boot/memtest.exe\ 5.16 \n&|' $1/boot/isolinux/isolinux.cfg 5.17 + cat <<EOT 5.18 + 5.19 +Output to vga and serial port. Default kernel cmdline: console=ttyS0,115200e8 5.20 +EOT 5.21 }