wok diff syslinux/stuff/iso2exe/taziso @ rev 20158

syslinux/taziso: bzimage64 support in inst2zip
author Pascal Bellard <pascal.bellard@slitaz.org>
date Wed Dec 27 11:28:03 2017 +0100 (2017-12-27)
parents 6ee45ac02b05
children bf56c7791f56
line diff
     1.1 --- a/syslinux/stuff/iso2exe/taziso	Mon Nov 21 13:31:22 2016 +0100
     1.2 +++ b/syslinux/stuff/iso2exe/taziso	Wed Dec 27 11:28:03 2017 +0100
     1.3 @@ -234,7 +234,7 @@
     1.4  		extraargs="mount=$(getuuid) subroot=slitaz"
     1.5  	fi
     1.6  	echo -en "\nInstall boot files..."
     1.7 -	for i in $media/boot/bzImage $media/boot/*pxe* \
     1.8 +	for i in $media/boot/bzImage* $media/boot/*pxe* \
     1.9  		$media/boot/isolinux/he* $media/boot/isolinux/opt* \
    1.10  		$media/README $media/boot/memtest* ; do
    1.11  		[ -s $i ] && cp $i $mnt/slitaz/boot
    1.12 @@ -243,7 +243,8 @@
    1.13  		[ $(get 0 $i 2> /dev/null || echo 0) -eq 23117 ] &&
    1.14  		mv $i $i.exe
    1.15  	done
    1.16 -	gettazboot $mnt/slitaz/boot/tazboot.exe
    1.17 +	bzimage=$(cd $mnt/slitaz/boot ; ls bzimage*)
    1.18 +	gettazboot $mnt/slitaz/boot/tazboot.exe	# autoappend 64 suffix
    1.19  	unix2dos > $mnt/slitaz/boot/tazboot.cmd <<EOT
    1.20  kernel=/slitaz/boot/bzimage
    1.21  initrd=/slitaz/boot/$initrd
    1.22 @@ -283,11 +284,11 @@
    1.23  		grub-install --no-floppy --root-directory=$mnt $base
    1.24  	fi
    1.25  	if [ -s $mnt/boot/grub/menu.lst ] &&
    1.26 -	   ! grep -q /slitaz/boot/bzimage $mnt/boot/grub/menu.lst; then
    1.27 -		echo -en "\nUpdate /boot/grub/menu/lst..."
    1.28 +	   ! grep -q /slitaz/boot/$bzimage $mnt/boot/grub/menu.lst; then
    1.29 +		echo -en "\nUpdate /boot/grub/menu.lst..."
    1.30  		cat >> $mnt/boot/grub/menu.lst <<EOT
    1.31  title SliTaz GNU/Linux $(cat $mnt/slitaz/etc/slitaz-release)
    1.32 -	kernel /slitaz/boot/bzimage rw root=/dev/null $extraargs autologin
    1.33 +	kernel /slitaz/boot/$bzimage rw root=/dev/null $extraargs autologin
    1.34  	initrd /slitaz/boot/$initrd
    1.35  
    1.36  EOT