wok-current rev 20210
syslinux: remove memtest & ipxe entries
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sat Feb 24 11:14:17 2018 +0100 (2018-02-24) |
parents | 50f7ecf8e694 |
children | 3407a40ec53b |
files | etherboot/receipt gpxe/receipt ipxe/receipt memtest-serial/receipt memtest/receipt syslinux/receipt syslinux/stuff/isolinux.cfg |
line diff
1.1 --- a/etherboot/receipt Fri Feb 23 11:28:14 2018 +0100 1.2 +++ b/etherboot/receipt Sat Feb 24 11:14:17 2018 +0100 1.3 @@ -42,4 +42,10 @@ 1.4 echo "You can create pxe/nbi boot floppy with:" 1.5 echo "# cp /usr/share/boot/etherboot /dev/fd0" 1.6 echo "----" 1.7 + [ -s $1/boot/isolinux/isolinux.cfg ] && 1.8 + ! grep -qs 'Web Boot' $1/boot/isolinux/isolinux.cfg && 1.9 + sed -i 's|i18n.cfg|&\n\ 1.10 +LABEL web zeb\ 1.11 + MENU LABEL Web Boot\ 1.12 + KERNEL /boot/etherboot|' $1/boot/isolinux/isolinux.cfg 1.13 }
2.1 --- a/gpxe/receipt Fri Feb 23 11:28:14 2018 +0100 2.2 +++ b/gpxe/receipt Sat Feb 24 11:14:17 2018 +0100 2.3 @@ -39,3 +39,14 @@ 2.4 http://download.tuxfamily.org/slitaz/pxe/pxelinux.0" | cat - /dev/zero | \ 2.5 dd bs=1 seek=519 count=255 conv=notrunc of=$fs/boot/gpxe 2.6 } 2.7 + 2.8 +# Pre and post install commands for Tazpkg. 2.9 +post_install() 2.10 +{ 2.11 + [ -s $1/boot/isolinux/isolinux.cfg ] && 2.12 + ! grep -qs 'Web Boot' $1/boot/isolinux/isolinux.cfg && 2.13 + sed -i 's|i18n.cfg|&\n\ 2.14 +LABEL web zeb\ 2.15 + MENU LABEL Web Boot\ 2.16 + KERNEL /boot/gpxe|' $1/boot/isolinux/isolinux.cfg 2.17 +}
3.1 --- a/ipxe/receipt Fri Feb 23 11:28:14 2018 +0100 3.2 +++ b/ipxe/receipt Sat Feb 24 11:14:17 2018 +0100 3.3 @@ -53,6 +53,17 @@ 3.4 { 3.5 mkdir -p $fs/boot $install/usr/share 3.6 cp -a $src/src/doc $install/usr/share 3.7 - cp -a $src/src/bin/ipxe.lkrn $fs/boot/ipxe 3.8 - dd if=$src/src/bootloader.bin of=$fs/boot/ipxe conv=notrunc 3.9 + cp -a $src/src/bin/ipxe.lkrn $fs/boot/ipxe.exe 3.10 + dd if=$src/src/bootloader.bin of=$fs/boot/ipxe.exe conv=notrunc 3.11 } 3.12 + 3.13 +# Pre and post install commands for Tazpkg. 3.14 +post_install() 3.15 +{ 3.16 + [ -s $1/boot/isolinux/isolinux.cfg ] && 3.17 + ! grep -qs 'Web Boot' $1/boot/isolinux/isolinux.cfg && 3.18 + sed -i 's|i18n.cfg|&\n\ 3.19 +LABEL web zeb\ 3.20 + MENU LABEL Web Boot\ 3.21 + KERNEL /boot/ipxe.exe|' $1/boot/isolinux/isolinux.cfg 3.22 +}
4.1 --- a/memtest-serial/receipt Fri Feb 23 11:28:14 2018 +0100 4.2 +++ b/memtest-serial/receipt Sat Feb 24 11:14:17 2018 +0100 4.3 @@ -8,18 +8,26 @@ 4.4 LICENSE="GPL2" 4.5 WEB_SITE="http://www.memtest.org/" 4.6 WANTED="memtest" 4.7 +PROVIDE="memtest" 4.8 4.9 # Rules to gen a SliTaz package suitable for Tazpkg. 4.10 genpkg_rules() 4.11 { 4.12 mkdir -p $fs/boot 4.13 - cp $src/memtest.packed-115200 $fs/boot/memtest 4.14 + cp $src/memtest.packed-115200 $fs/boot/memtest.exe 4.15 } 4.16 4.17 # Pre and post install commands for Tazpkg. 4.18 post_install() 4.19 { 4.20 cat <<EOT 4.21 + 4.22 Output to vga and serial port. Default kernel cmdline: console=ttyS0,115200e8 4.23 EOT 4.24 + [ -s $1/boot/isolinux/isolinux.cfg ] && 4.25 + ! grep -qs 'Check memory' $1/boot/isolinux/isolinux.cfg && sed -i \ 4.26 +'s|LABEL md5|LABEL memtest mem ram\ 4.27 + MENU LABEL Check memory\ 4.28 + KERNEL /boot/memtest.exe\ 4.29 +\n&|' $1/boot/isolinux/isolinux.cfg 4.30 }
5.1 --- a/memtest/receipt Fri Feb 23 11:28:14 2018 +0100 5.2 +++ b/memtest/receipt Sat Feb 24 11:14:17 2018 +0100 5.3 @@ -45,5 +45,16 @@ 5.4 mkdir -p $fs/boot $install/usr/share/doc 5.5 cp $src/README* $install/usr/share/doc 5.6 cp $src/FAQ $install/usr/share/doc 5.7 - cp $src/memtest.packed $fs/boot/memtest 5.8 + cp $src/memtest.packed $fs/boot/memtest.exe 5.9 } 5.10 + 5.11 +# Pre and post install commands for Tazpkg. 5.12 +post_install() 5.13 +{ 5.14 + [ -s $1/boot/isolinux/isolinux.cfg ] && 5.15 + ! grep -qs 'Check memory' $1/boot/isolinux/isolinux.cfg && sed -i \ 5.16 +'s|LABEL md5|LABEL memtest mem ram\ 5.17 + MENU LABEL Check memory\ 5.18 + KERNEL /boot/memtest.exe\ 5.19 +\n&|' $1/boot/isolinux/isolinux.cfg 5.20 +}
6.1 --- a/syslinux/receipt Fri Feb 23 11:28:14 2018 +0100 6.2 +++ b/syslinux/receipt Sat Feb 24 11:14:17 2018 +0100 6.3 @@ -148,4 +148,8 @@ 6.4 "$1/boot/isolinux/isolinux.cfg" 6.5 sed '/MENU TITLE/!d;s/MENU TITLE //' > $1/etc/slitaz-version \ 6.6 < "$1/boot/isolinux/isolinux.cfg" 6.7 + for i in $(grep -ls boot/isolinux/isolinux.cfg \ 6.8 + "$1/var/lib/tazpkg/install/*/receipt); do 6.9 + chroot "$1" tazpkg reconfigure $(basename ${i%/*}) 6.10 + done 6.11 }
7.1 --- a/syslinux/stuff/isolinux.cfg Fri Feb 23 11:28:14 2018 +0100 7.2 +++ b/syslinux/stuff/isolinux.cfg Sat Feb 24 11:14:17 2018 +0100 7.3 @@ -33,10 +33,6 @@ 7.4 7.5 INCLUDE i18n.cfg 7.6 7.7 -LABEL memtest mem ram 7.8 - MENU LABEL Check memory 7.9 - KERNEL /boot/memtest 7.10 - 7.11 LABEL md5sum check test verify 7.12 MENU LABEL Check media 7.13 COM32 c32box.c32 7.14 @@ -46,10 +42,6 @@ 7.15 MENU LABEL Command Line 7.16 MENU QUIT 7.17 7.18 -LABEL web zeb 7.19 - MENU LABEL Web Boot 7.20 - KERNEL /boot/ipxe 7.21 - 7.22 LABEL reboot 7.23 MENU LABEL Reboot System 7.24 COM32 c32box.c32