# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1423995511 -3600
# Node ID 17923f312c4e984b1be73c28af9fabf3b3cc51d9
# Parent  e9f0020548316fa926d0d18bad45fd42566fa019
syslinux/taziso: kexec do not load zImage

diff -r e9f002054831 -r 17923f312c4e syslinux-extra/receipt
--- a/syslinux-extra/receipt	Sun Feb 15 09:07:43 2015 +0100
+++ b/syslinux-extra/receipt	Sun Feb 15 11:18:31 2015 +0100
@@ -27,5 +27,6 @@
     cp -a $src/extlinux/extlinux $fs/bin
     cp -a $src/isohybrid.sh $fs/usr/bin/isohybrid
     cp -a $src/iso2exe/iso2exe $fs/usr/bin/iso2exe
+    cp -a $src/iso2exe/taziso $fs/usr/bin
     chown root.root $fs/usr/share/boot/* $fs/bin/* $fs/usr/bin/*
 }
diff -r e9f002054831 -r 17923f312c4e syslinux-tools/receipt
--- a/syslinux-tools/receipt	Sun Feb 15 09:07:43 2015 +0100
+++ b/syslinux-tools/receipt	Sun Feb 15 11:18:31 2015 +0100
@@ -21,6 +21,5 @@
 	cp -a $src/iso2exe/isohybrid.exe $fs/usr/share/boot
 	cp -a $src/iso2exe/meminfo.exe $fs/usr/share/boot
 	cp -a $src/iso2exe/tazboot.exe $fs/usr/share/boot
-	cp -a $src/iso2exe/taziso $fs/usr/bin
 	find $fs/usr -exec chown root.root {} \;
 }
diff -r e9f002054831 -r 17923f312c4e syslinux/stuff/iso2exe/init
--- a/syslinux/stuff/iso2exe/init	Sun Feb 15 09:07:43 2015 +0100
+++ b/syslinux/stuff/iso2exe/init	Sun Feb 15 11:18:31 2015 +0100
@@ -611,9 +611,18 @@
 	gotcdfile "$1" && echo -en "\"$2\"	\"$3\""
 }
 
+isbzImage()
+{
+	[ $(get 514 $file 4) -eq 1400005704 ] &&
+	[ $(($(get 529 $file 1) & 1)) -eq 1 ]
+}
+
 cdfilex()
 {
-	[ "$(which kexec)" ] && cdfile "$@"
+	gotcdfile "$1" &&
+	[ "$(which kexec)" ] &&
+	isbzImage &&
+	echo -en "\"$2\"	\"$3\""
 }
 
 cdfilef()
@@ -874,7 +883,7 @@
 
 dokexec()
 {
-	kexec -l $file
+	kexec -l $file || return
 	dosync
 	kexec -e
 }
diff -r e9f002054831 -r 17923f312c4e syslinux/stuff/iso2exe/taziso
--- a/syslinux/stuff/iso2exe/taziso	Sun Feb 15 09:07:43 2015 +0100
+++ b/syslinux/stuff/iso2exe/taziso	Sun Feb 15 11:18:31 2015 +0100
@@ -348,7 +348,7 @@
 	[ -x $mnt/slitaz$1 ] || return
 	[ -s $mnt/slitaz/boot/tazboot.cmd ] || return
 	readtazbootconf
-	kexec -l $kernel --initrd $initrd --command-line "$cmdline" --atags
+	kexec -l $kernel --initrd $initrd --command-line "$cmdline" || return
 	umount $mnt
 	rm -rf $mnt
 	umount -d /media/cdrom
@@ -384,6 +384,11 @@
 EOT
 	unix2dos $mnt/slitaz/boot/menu.lst
 	unix2dos > $mnt/slitaz/boot/install.txt <<EOT
+For DOS users (real mode only):
+
+Start SliTaz with \\slitaz\\boot\\tazboot.exe
+
+
 For NT/2000/XP users:
 
 1- Move the files grldr and menu.lst into the root directory
@@ -471,9 +476,10 @@
 	kernel=/media/cdrom/boot/bzImage
 	grep -q ' lm ' /proc/cpuinfo && [ -s ${kernel}64 ] && kernel=${kernel}64
 	. /etc/locale.conf
-	kexec -l $kernel --initrd /tmp/initrd$$ --atags --command-line \
-	   "root=/dev/null autologin lang=$LANG kmap=$(cat /etc/keymap.conf)"
+	kexec -l $kernel --initrd /tmp/initrd$$ --command-line \
+	   "root=/dev/null autologin lang=$LANG kmap=$(cat /etc/keymap.conf)" &&
 	umount -d /media/cdrom
+	rm -f /tmp/initrd$$
 	kexec -e
 }
 
@@ -656,9 +662,18 @@
 	gotcdfile "$1" && echo -en "\"$2\"	\"$3\""
 }
 
+isbzImage()
+{
+	[ $(get 514 $file 4) -eq 1400005704 ] &&
+	[ $(($(get 529 $file 1) & 1)) -eq 1 ]
+}
+
 cdfilex()
 {
-	[ "$(which kexec)" ] && cdfile "$@"
+	gotcdfile "$1" &&
+	[ "$(which kexec)" ] &&
+	isbzImage &&
+	echo -en "\"$2\"	\"$3\""
 }
 
 cdfilef()
@@ -850,7 +865,7 @@
 
 dokexec()
 {
-	kexec -l $file
+	kexec -l $file || return
 	umount -d /media/cdrom
 	kexec -e
 }