# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1514370483 -3600
# Node ID a686b7799fe98c0cfc6d5183f1d56a24dfa892ba
# Parent  1e05ffbc1473ef41ac020db8245e4801f823bfcd
syslinux/taziso: bzimage64 support in inst2zip

diff -r 1e05ffbc1473 -r a686b7799fe9 syslinux/stuff/iso2exe/taziso
--- a/syslinux/stuff/iso2exe/taziso	Mon Dec 25 21:46:51 2017 +0100
+++ b/syslinux/stuff/iso2exe/taziso	Wed Dec 27 11:28:03 2017 +0100
@@ -234,7 +234,7 @@
 		extraargs="mount=$(getuuid) subroot=slitaz"
 	fi
 	echo -en "\nInstall boot files..."
-	for i in $media/boot/bzImage $media/boot/*pxe* \
+	for i in $media/boot/bzImage* $media/boot/*pxe* \
 		$media/boot/isolinux/he* $media/boot/isolinux/opt* \
 		$media/README $media/boot/memtest* ; do
 		[ -s $i ] && cp $i $mnt/slitaz/boot
@@ -243,7 +243,8 @@
 		[ $(get 0 $i 2> /dev/null || echo 0) -eq 23117 ] &&
 		mv $i $i.exe
 	done
-	gettazboot $mnt/slitaz/boot/tazboot.exe
+	bzimage=$(cd $mnt/slitaz/boot ; ls bzimage*)
+	gettazboot $mnt/slitaz/boot/tazboot.exe	# autoappend 64 suffix
 	unix2dos > $mnt/slitaz/boot/tazboot.cmd <<EOT
 kernel=/slitaz/boot/bzimage
 initrd=/slitaz/boot/$initrd
@@ -283,11 +284,11 @@
 		grub-install --no-floppy --root-directory=$mnt $base
 	fi
 	if [ -s $mnt/boot/grub/menu.lst ] &&
-	   ! grep -q /slitaz/boot/bzimage $mnt/boot/grub/menu.lst; then
-		echo -en "\nUpdate /boot/grub/menu/lst..."
+	   ! grep -q /slitaz/boot/$bzimage $mnt/boot/grub/menu.lst; then
+		echo -en "\nUpdate /boot/grub/menu.lst..."
 		cat >> $mnt/boot/grub/menu.lst <<EOT
 title SliTaz GNU/Linux $(cat $mnt/slitaz/etc/slitaz-release)
-	kernel /slitaz/boot/bzimage rw root=/dev/null $extraargs autologin
+	kernel /slitaz/boot/$bzimage rw root=/dev/null $extraargs autologin
 	initrd /slitaz/boot/$initrd
 
 EOT