SliTaz Repositories

     1.1 --- a/syslinux/stuff/iso2exe/taziso	Sat Feb 14 21:16:05 2015 +0100
     1.2 +++ b/syslinux/stuff/iso2exe/taziso	Sun Feb 15 11:18:31 2015 +0100
     1.3 @@ -348,7 +348,7 @@
     1.4  	[ -x $mnt/slitaz$1 ] || return
     1.5  	[ -s $mnt/slitaz/boot/tazboot.cmd ] || return
     1.6  	readtazbootconf
     1.7 -	kexec -l $kernel --initrd $initrd --command-line "$cmdline" --atags
     1.8 +	kexec -l $kernel --initrd $initrd --command-line "$cmdline" || return
     1.9  	umount $mnt
    1.10  	rm -rf $mnt
    1.11  	umount -d /media/cdrom
    1.12 @@ -384,6 +384,11 @@
    1.13  EOT
    1.14  	unix2dos $mnt/slitaz/boot/menu.lst
    1.15  	unix2dos > $mnt/slitaz/boot/install.txt <<EOT
    1.16 +For DOS users (real mode only):
    1.17 +
    1.18 +Start SliTaz with \\slitaz\\boot\\tazboot.exe
    1.19 +
    1.20 +
    1.21  For NT/2000/XP users:
    1.22  
    1.23  1- Move the files grldr and menu.lst into the root directory
    1.24 @@ -471,9 +476,10 @@
    1.25  	kernel=/media/cdrom/boot/bzImage
    1.26  	grep -q ' lm ' /proc/cpuinfo && [ -s ${kernel}64 ] && kernel=${kernel}64
    1.27  	. /etc/locale.conf
    1.28 -	kexec -l $kernel --initrd /tmp/initrd$$ --atags --command-line \
    1.29 -	   "root=/dev/null autologin lang=$LANG kmap=$(cat /etc/keymap.conf)"
    1.30 +	kexec -l $kernel --initrd /tmp/initrd$$ --command-line \
    1.31 +	   "root=/dev/null autologin lang=$LANG kmap=$(cat /etc/keymap.conf)" &&
    1.32  	umount -d /media/cdrom
    1.33 +	rm -f /tmp/initrd$$
    1.34  	kexec -e
    1.35  }
    1.36  
    1.37 @@ -656,9 +662,18 @@
    1.38  	gotcdfile "$1" && echo -en "\"$2\"	\"$3\""
    1.39  }
    1.40  
    1.41 +isbzImage()
    1.42 +{
    1.43 +	[ $(get 514 $file 4) -eq 1400005704 ] &&
    1.44 +	[ $(($(get 529 $file 1) & 1)) -eq 1 ]
    1.45 +}
    1.46 +
    1.47  cdfilex()
    1.48  {
    1.49 -	[ "$(which kexec)" ] && cdfile "$@"
    1.50 +	gotcdfile "$1" &&
    1.51 +	[ "$(which kexec)" ] &&
    1.52 +	isbzImage &&
    1.53 +	echo -en "\"$2\"	\"$3\""
    1.54  }
    1.55  
    1.56  cdfilef()
    1.57 @@ -850,7 +865,7 @@
    1.58  
    1.59  dokexec()
    1.60  {
    1.61 -	kexec -l $file
    1.62 +	kexec -l $file || return
    1.63  	umount -d /media/cdrom
    1.64  	kexec -e
    1.65  }