# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1519467257 -3600
# Node ID beda06c66d6013c9a0fb123ebe27035110bfcb1b
# Parent  50f7ecf8e69426621d259567e9de77950d4b8eb4
syslinux: remove memtest & ipxe entries

diff -r 50f7ecf8e694 -r beda06c66d60 etherboot/receipt
--- a/etherboot/receipt	Fri Feb 23 11:28:14 2018 +0100
+++ b/etherboot/receipt	Sat Feb 24 11:14:17 2018 +0100
@@ -42,4 +42,10 @@
 	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
 }
diff -r 50f7ecf8e694 -r beda06c66d60 gpxe/receipt
--- a/gpxe/receipt	Fri Feb 23 11:28:14 2018 +0100
+++ b/gpxe/receipt	Sat Feb 24 11:14:17 2018 +0100
@@ -39,3 +39,14 @@
 http://download.tuxfamily.org/slitaz/pxe/pxelinux.0" | cat - /dev/zero | \
 		dd bs=1 seek=519 count=255 conv=notrunc of=$fs/boot/gpxe
 }
+
+# Pre and post install commands for Tazpkg.
+post_install()
+{
+	[ -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/gpxe|' $1/boot/isolinux/isolinux.cfg
+}
diff -r 50f7ecf8e694 -r beda06c66d60 ipxe/receipt
--- a/ipxe/receipt	Fri Feb 23 11:28:14 2018 +0100
+++ b/ipxe/receipt	Sat Feb 24 11:14:17 2018 +0100
@@ -53,6 +53,17 @@
 {
 	mkdir -p $fs/boot $install/usr/share
 	cp -a $src/src/doc $install/usr/share
-	cp -a $src/src/bin/ipxe.lkrn $fs/boot/ipxe
-	dd if=$src/src/bootloader.bin of=$fs/boot/ipxe conv=notrunc
+	cp -a $src/src/bin/ipxe.lkrn $fs/boot/ipxe.exe
+	dd if=$src/src/bootloader.bin of=$fs/boot/ipxe.exe conv=notrunc
 }
+
+# Pre and post install commands for Tazpkg.
+post_install()
+{
+	[ -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/ipxe.exe|' $1/boot/isolinux/isolinux.cfg
+}
diff -r 50f7ecf8e694 -r beda06c66d60 memtest-serial/receipt
--- a/memtest-serial/receipt	Fri Feb 23 11:28:14 2018 +0100
+++ b/memtest-serial/receipt	Sat Feb 24 11:14:17 2018 +0100
@@ -8,18 +8,26 @@
 LICENSE="GPL2"
 WEB_SITE="http://www.memtest.org/"
 WANTED="memtest"
+PROVIDE="memtest"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
 	mkdir -p $fs/boot
-	cp $src/memtest.packed-115200 $fs/boot/memtest
+	cp $src/memtest.packed-115200 $fs/boot/memtest.exe
 }
 
 # 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
 }
diff -r 50f7ecf8e694 -r beda06c66d60 memtest/receipt
--- a/memtest/receipt	Fri Feb 23 11:28:14 2018 +0100
+++ b/memtest/receipt	Sat Feb 24 11:14:17 2018 +0100
@@ -45,5 +45,16 @@
 	mkdir -p $fs/boot $install/usr/share/doc
 	cp $src/README* $install/usr/share/doc
 	cp $src/FAQ $install/usr/share/doc
-	cp $src/memtest.packed $fs/boot/memtest
+	cp $src/memtest.packed $fs/boot/memtest.exe
 }
+
+# Pre and post install commands for Tazpkg.
+post_install()
+{
+	[ -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
+}
diff -r 50f7ecf8e694 -r beda06c66d60 syslinux/receipt
--- a/syslinux/receipt	Fri Feb 23 11:28:14 2018 +0100
+++ b/syslinux/receipt	Sat Feb 24 11:14:17 2018 +0100
@@ -148,4 +148,8 @@
 		"$1/boot/isolinux/isolinux.cfg"
 	sed '/MENU TITLE/!d;s/MENU TITLE //' > $1/etc/slitaz-version \
 		< "$1/boot/isolinux/isolinux.cfg"
+	for i in $(grep -ls boot/isolinux/isolinux.cfg \
+			"$1/var/lib/tazpkg/install/*/receipt); do
+		chroot "$1" tazpkg reconfigure $(basename ${i%/*})
+	done
 }
diff -r 50f7ecf8e694 -r beda06c66d60 syslinux/stuff/isolinux.cfg
--- a/syslinux/stuff/isolinux.cfg	Fri Feb 23 11:28:14 2018 +0100
+++ b/syslinux/stuff/isolinux.cfg	Sat Feb 24 11:14:17 2018 +0100
@@ -33,10 +33,6 @@
 
 INCLUDE i18n.cfg
 
-LABEL memtest mem ram
-	MENU LABEL Check memory
-	KERNEL /boot/memtest
-
 LABEL md5sum check test verify
 	MENU LABEL Check media
 	COM32 c32box.c32
@@ -46,10 +42,6 @@
 	MENU LABEL Command Line
 	MENU QUIT
 	
-LABEL web zeb
-	MENU LABEL Web Boot
-	KERNEL /boot/ipxe
-
 LABEL reboot
 	MENU LABEL Reboot System
 	COM32 c32box.c32