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

syslinux/iso2exe: fix linld.com path
author Pascal Bellard <pascal.bellard@slitaz.org>
date Mon May 25 18:40:12 2020 +0000 (2020-05-25)
parents e93fa0cecd8a
children 7744355508b9
line diff
     1.1 --- a/syslinux/stuff/iso2exe/taziso	Mon May 25 16:38:34 2020 +0000
     1.2 +++ b/syslinux/stuff/iso2exe/taziso	Mon May 25 18:40:12 2020 +0000
     1.3 @@ -40,7 +40,8 @@
     1.4  	uudecode - >> $1 << EOT
     1.5  HEADERCODE
     1.6  EOT
     1.7 -	ddq if=$media/boot/linld.com >> $1
     1.8 +	gotcdfile linld.com
     1.9 +	ddq if=$file >> $1
    1.10  }
    1.11  
    1.12  uncpio()
    1.13 @@ -253,7 +254,7 @@
    1.14  	cp /etc/keymap.conf /etc/locale.conf $mnt/slitaz/etc 2> /dev/null
    1.15  	gettazboot $mnt/slitaz/boot/tazboot.exe	# autoappend 64 suffix
    1.16  	unix2dos > $mnt/slitaz/boot/tazboot.cmd <<EOT
    1.17 -kernel=/slitaz/boot/bzimage
    1.18 +image=/slitaz/boot/bzimage
    1.19  initrd=/slitaz/boot/$initrd
    1.20  $extraargs autologin
    1.21  EOT
    1.22 @@ -396,9 +397,9 @@
    1.23  
    1.24  readtazbootconf()
    1.25  {
    1.26 -	kernel="$(sed '/^kernel=/!d;s/.*=//' $mnt/slitaz/boot/tazboot.cmd)"
    1.27 +	kernel="$(sed '/^image=/!d;s/.*=//' $mnt/slitaz/boot/tazboot.cmd)"
    1.28  	initrd="$(sed '/^initrd=/!d;s/.*=//' $mnt/slitaz/boot/tazboot.cmd)"
    1.29 -	cmdline="$(sed '/^kernel=/d;/^initrd=/d' $mnt/slitaz/boot/tazboot.cmd)"
    1.30 +	cmdline="$(sed '/^image=/d;/^initrd=/d' $mnt/slitaz/boot/tazboot.cmd)"
    1.31  }
    1.32  
    1.33  bootinstalled()