# HG changeset patch # User Pascal Bellard # Date 1606912541 0 # Node ID f3eb71ce1913f258db68f92b16a05ecc468d012b # Parent 555bcdab610b7922cc0f979578f8fa6d998c5e38 syslinux: fix iso2exe/init diff -r 555bcdab610b -r f3eb71ce1913 linld/stuff/src/ISOCRTL.ASM --- a/linld/stuff/src/ISOCRTL.ASM Sat Nov 28 09:45:01 2020 +0000 +++ b/linld/stuff/src/ISOCRTL.ASM Wed Dec 02 12:35:41 2020 +0000 @@ -149,6 +149,7 @@ je doseek add dx,[bx+4] ; _isostate.filesize adc cx,[bx+6] + mov al,0 doseek: call lseek ; lseek(,,al) sub_fileofs: diff -r 555bcdab610b -r f3eb71ce1913 syslinux/stuff/iso2exe/init --- a/syslinux/stuff/iso2exe/init Sat Nov 28 09:45:01 2020 +0000 +++ b/syslinux/stuff/iso2exe/init Wed Dec 02 12:35:41 2020 +0000 @@ -36,7 +36,7 @@ { mkdir -p $media for dev in /sys/block/*; do - dev=$(ls $dev/$(basename $dev)* 2> /dev/null) + dev=$(ls -d $dev/$(basename $dev)*) [ "$dev" ] || continue mount /dev/$(basename $dev) $mnt if checkmagic $mnt/$ISO; then @@ -46,7 +46,7 @@ return 0 fi umount $mnt - done 2>/dev/null + done return 1 } @@ -192,5 +192,4 @@ getiso 2>/dev/null || text mount_loram [ -s /usr/bin/taziso ] || live - -. /usr/bin/taziso +. /usr/bin/taziso $ISO