# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1590432012 0
# Node ID 3f40a3c71c48da98d976d7060d8bddc877a41b72
# Parent  ec56ab0f8e5b6c34e99368377c6a169fe151f315
syslinux/iso2exe: fix linld.com path

diff -r ec56ab0f8e5b -r 3f40a3c71c48 syslinux/stuff/iso2exe/init
--- a/syslinux/stuff/iso2exe/init	Mon May 25 16:59:16 2020 +0000
+++ b/syslinux/stuff/iso2exe/init	Mon May 25 18:40:12 2020 +0000
@@ -134,7 +134,8 @@
 	uudecode - >> $1 << EOT
 HEADERCODE
 EOT
-	ddq if=/media/slitaz/boot/linld.com >> $1
+	gotcdfile linld.com
+	ddq if=$file >> $1
 }
 
 checkmagic()
@@ -339,7 +340,7 @@
 	cp /etc/keymap.conf /etc/locale.conf /mnt/slitaz/etc 2>/dev/null
 	gettazboot /mnt/slitaz/boot/tazboot.exe
 	unix2dos > /mnt/slitaz/boot/tazboot.cmd <<EOT
-kernel=/slitaz/boot/bzimage
+image=/slitaz/boot/bzimage
 initrd=/slitaz/boot/$initrd
 $extraargs autologin
 EOT
@@ -441,7 +442,7 @@
 [initrd=<rootfs>[,<rootfs2>...]] cmdline args ...]\n\n
 Defaults: tazboot @tazboot.cmd or tazboot image=bzImage auto\n\n\
 Examples for tazboot.cmd:\n\n\
-  kernel=boot/bzImage\n\
+  image=boot/bzImage\n\
   initrd=boot/rootfs4.gz,boot/rootfs3.gz,boot/rootfs2.gz,boot/rootfs1.gz\n\
   autologin\n\n\
   image=\\slitaz\\vmlinuz root=/dev/sda5 ro\n" 24 78
diff -r ec56ab0f8e5b -r 3f40a3c71c48 syslinux/stuff/iso2exe/taziso
--- a/syslinux/stuff/iso2exe/taziso	Mon May 25 16:59:16 2020 +0000
+++ b/syslinux/stuff/iso2exe/taziso	Mon May 25 18:40:12 2020 +0000
@@ -40,7 +40,8 @@
 	uudecode - >> $1 << EOT
 HEADERCODE
 EOT
-	ddq if=$media/boot/linld.com >> $1
+	gotcdfile linld.com
+	ddq if=$file >> $1
 }
 
 uncpio()
@@ -253,7 +254,7 @@
 	cp /etc/keymap.conf /etc/locale.conf $mnt/slitaz/etc 2> /dev/null
 	gettazboot $mnt/slitaz/boot/tazboot.exe	# autoappend 64 suffix
 	unix2dos > $mnt/slitaz/boot/tazboot.cmd <<EOT
-kernel=/slitaz/boot/bzimage
+image=/slitaz/boot/bzimage
 initrd=/slitaz/boot/$initrd
 $extraargs autologin
 EOT
@@ -396,9 +397,9 @@
 
 readtazbootconf()
 {
-	kernel="$(sed '/^kernel=/!d;s/.*=//' $mnt/slitaz/boot/tazboot.cmd)"
+	kernel="$(sed '/^image=/!d;s/.*=//' $mnt/slitaz/boot/tazboot.cmd)"
 	initrd="$(sed '/^initrd=/!d;s/.*=//' $mnt/slitaz/boot/tazboot.cmd)"
-	cmdline="$(sed '/^kernel=/d;/^initrd=/d' $mnt/slitaz/boot/tazboot.cmd)"
+	cmdline="$(sed '/^image=/d;/^initrd=/d' $mnt/slitaz/boot/tazboot.cmd)"
 }
 
 bootinstalled()