SliTaz Repositories

     1.1 --- a/syslinux/stuff/iso2exe/taziso	Fri Feb 05 17:16:12 2021 +0000
     1.2 +++ b/syslinux/stuff/iso2exe/taziso	Mon Mar 15 20:49:46 2021 +0000
     1.3 @@ -253,7 +253,7 @@
     1.4  	fi
     1.5  	dotwait "Install root filesystem in /slitaz.."
     1.6  	if [ "$1" ]; then
     1.7 -		ls_r $media/boot/rootfs*gz | \
     1.8 +		ls_r $media/boot/rootfs*gz* | \
     1.9  		xargs cat > $mnt/slitaz/boot/rootfs.gz
    1.10  		tazusbinitfs $mnt/slitaz/boot/rootfs.gz $useposixovl
    1.11  		initrd=rootfs.gz
    1.12 @@ -270,7 +270,7 @@
    1.13                                  losetup -d /dev/loop7                          
    1.14                          done                                                   
    1.15                  else
    1.16 -			for i in $(ls_r $media/boot/rootfs*gz); do
    1.17 +			for i in $(ls_r $media/boot/rootfs*gz*); do
    1.18  				${uncpio:-uncpio} $i $mnt/slitaz
    1.19  			done
    1.20  		fi
    1.21 @@ -298,11 +298,11 @@
    1.22  		[ $(get 0 $i 2> /dev/null || echo 0) -eq 23117 ] &&
    1.23  		mv $i $i.exe
    1.24  	done
    1.25 -	bzimage=$(cd $mnt/slitaz/boot ; ls bzimage*)
    1.26 +	bzimage=$(cd $mnt/slitaz/boot ; ls bzImage* | sed q)
    1.27  	cp /etc/keymap.conf /etc/locale.conf $mnt/slitaz/etc 2> /dev/null
    1.28  	gettazboot $mnt/slitaz/boot/tazboot.exe	# autoappend 64 suffix
    1.29  	unix2dos > $mnt/slitaz/boot/tazboot.cmd <<EOT
    1.30 -image=/slitaz/boot/bzimage
    1.31 +image=/slitaz/boot/$bzimage
    1.32  initrd=/slitaz/boot/$initrd
    1.33  root=/dev/null $extraargs autologin
    1.34  EOT
    1.35 @@ -455,8 +455,8 @@
    1.36  start SliTaz Live with the 'SliTaz RAM boot' menu.\n" 19 70
    1.37  	[ $? -eq 0 ] || return
    1.38  	doinstall
    1.39 -	[ $0 = /init.exe ] || return
    1.40 -	[ -x $mnt/slitaz/sbin/init ] || return
    1.41 +	[ $0 = /init.exe ] || return 0
    1.42 +	[ -x $mnt/slitaz/sbin/init ] || return 0
    1.43  	umount -d $media/cdrom
    1.44  	umount_proc
    1.45  	exec chroot $mnt/slitaz /sbin/init
    1.46 @@ -619,7 +619,7 @@
    1.47  	if [ "$1" ]; then
    1.48  		doinstall tazusblike
    1.49  	else
    1.50 -		_installtaz && bootinstalled /boot/bzimage
    1.51 +		_installtaz && bootinstalled /boot/bzImage
    1.52  	fi
    1.53  	umount $mnt
    1.54  	rm -rf $mnt