wok rev 23813

syslinux/iso2exe: fix linld.com path
author Pascal Bellard <pascal.bellard@slitaz.org>
date Mon May 25 18:40:12 2020 +0000 (5 months ago)
parents ec56ab0f8e5b
children b454de65b47b
files syslinux/stuff/iso2exe/init syslinux/stuff/iso2exe/taziso
line diff
     1.1 --- a/syslinux/stuff/iso2exe/init	Mon May 25 16:59:16 2020 +0000
     1.2 +++ b/syslinux/stuff/iso2exe/init	Mon May 25 18:40:12 2020 +0000
     1.3 @@ -134,7 +134,8 @@
     1.4  	uudecode - >> $1 << EOT
     1.5  HEADERCODE
     1.6  EOT
     1.7 -	ddq if=/media/slitaz/boot/linld.com >> $1
     1.8 +	gotcdfile linld.com
     1.9 +	ddq if=$file >> $1
    1.10  }
    1.11  
    1.12  checkmagic()
    1.13 @@ -339,7 +340,7 @@
    1.14  	cp /etc/keymap.conf /etc/locale.conf /mnt/slitaz/etc 2>/dev/null
    1.15  	gettazboot /mnt/slitaz/boot/tazboot.exe
    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 @@ -441,7 +442,7 @@
    1.23  [initrd=<rootfs>[,<rootfs2>...]] cmdline args ...]\n\n
    1.24  Defaults: tazboot @tazboot.cmd or tazboot image=bzImage auto\n\n\
    1.25  Examples for tazboot.cmd:\n\n\
    1.26 -  kernel=boot/bzImage\n\
    1.27 +  image=boot/bzImage\n\
    1.28    initrd=boot/rootfs4.gz,boot/rootfs3.gz,boot/rootfs2.gz,boot/rootfs1.gz\n\
    1.29    autologin\n\n\
    1.30    image=\\slitaz\\vmlinuz root=/dev/sda5 ro\n" 24 78
     2.1 --- a/syslinux/stuff/iso2exe/taziso	Mon May 25 16:59:16 2020 +0000
     2.2 +++ b/syslinux/stuff/iso2exe/taziso	Mon May 25 18:40:12 2020 +0000
     2.3 @@ -40,7 +40,8 @@
     2.4  	uudecode - >> $1 << EOT
     2.5  HEADERCODE
     2.6  EOT
     2.7 -	ddq if=$media/boot/linld.com >> $1
     2.8 +	gotcdfile linld.com
     2.9 +	ddq if=$file >> $1
    2.10  }
    2.11  
    2.12  uncpio()
    2.13 @@ -253,7 +254,7 @@
    2.14  	cp /etc/keymap.conf /etc/locale.conf $mnt/slitaz/etc 2> /dev/null
    2.15  	gettazboot $mnt/slitaz/boot/tazboot.exe	# autoappend 64 suffix
    2.16  	unix2dos > $mnt/slitaz/boot/tazboot.cmd <<EOT
    2.17 -kernel=/slitaz/boot/bzimage
    2.18 +image=/slitaz/boot/bzimage
    2.19  initrd=/slitaz/boot/$initrd
    2.20  $extraargs autologin
    2.21  EOT
    2.22 @@ -396,9 +397,9 @@
    2.23  
    2.24  readtazbootconf()
    2.25  {
    2.26 -	kernel="$(sed '/^kernel=/!d;s/.*=//' $mnt/slitaz/boot/tazboot.cmd)"
    2.27 +	kernel="$(sed '/^image=/!d;s/.*=//' $mnt/slitaz/boot/tazboot.cmd)"
    2.28  	initrd="$(sed '/^initrd=/!d;s/.*=//' $mnt/slitaz/boot/tazboot.cmd)"
    2.29 -	cmdline="$(sed '/^kernel=/d;/^initrd=/d' $mnt/slitaz/boot/tazboot.cmd)"
    2.30 +	cmdline="$(sed '/^image=/d;/^initrd=/d' $mnt/slitaz/boot/tazboot.cmd)"
    2.31  }
    2.32  
    2.33  bootinstalled()