wok diff syslinux/stuff/iso2exe/init @ rev 16012
syslinux/iso2exe: access both local and isofs namespaces
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Tue Mar 04 21:00:29 2014 +0000 (2014-03-04) |
parents | 4ae7c7dde4e2 |
children | 82c793b0a850 |
line diff
1.1 --- a/syslinux/stuff/iso2exe/init Mon Oct 14 15:01:17 2013 +0000 1.2 +++ b/syslinux/stuff/iso2exe/init Tue Mar 04 21:00:29 2014 +0000 1.3 @@ -291,7 +291,7 @@ 1.4 miss many of the failures that are detected by Memtest86.\n 1.5 " 12 70 1.6 [ $? -eq 0 ] || return 1.7 - cp /media/cdrom/boot/memtest /mnt 1.8 + cp /media/cdrom/boot/memtest /mnt/memtest.exe 1.9 } 1.10 1.11 fdmemtest() 1.12 @@ -319,7 +319,8 @@ 1.13 from the Web using PXE and HTTP protocols.\n 1.14 " 12 70 1.15 [ $? -eq 0 ] || return 1.16 - cp /media/cdrom/boot/?pxe /mnt 1.17 + pxe=$(ls /media/cdrom/boot/?pxe) 1.18 + cp $pxe /mnt/$(basename $pxe).exe 1.19 } 1.20 1.21 fdgpxe() 1.22 @@ -536,12 +537,12 @@ 1.23 "usbbootkey" "USB boot key (read only)" \ 1.24 $(fddata "fdbootstrap" "Floppy bootstrap") \ 1.25 "tazboot" "Get tazboot.exe Linux loader" \ 1.26 -$(cdfile Xboot/memtest "memtest" "Get Memtest86") \ 1.27 +$(cdfile boot/memtest "memtest" "Get Memtest86") \ 1.28 $(cdfile boot/memtest "fdmemtest" "Create a Memtest86 boot floppy") \ 1.29 -$(cdfile Xboot/gpxe "gpxe" "Get SliTaz Web boot utility") \ 1.30 -$(cdfile boot/gpxe "fdgpxe" "Create a SliTaz Web boot floppy") \ 1.31 -$(cdfile Xboot/ipxe "gpxe" "Get SliTaz Web boot utility") \ 1.32 -$(cdfile boot/ipxe "fdgpxe" "Create a SliTaz Web boot floppy") \ 1.33 +$(cdfile boot/gpxe "pxe" "Get SliTaz Web boot utility") \ 1.34 +$(cdfile boot/gpxe "fdpxe" "Create a SliTaz Web boot floppy") \ 1.35 +$(cdfile boot/ipxe "pxe" "Get SliTaz Web boot utility") \ 1.36 +$(cdfile boot/ipxe "fdpxe" "Create a SliTaz Web boot floppy") \ 1.37 $(xfile reboot "restart" "Restart the computer") \ 1.38 $(xfile poweroff "stop" "Power off") \ 1.39 "bootlog" "Linux boot messages" \