wok-next diff syslinux/stuff/iso2exe/init @ rev 20197
syslinux: updates from rolling
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Fri Nov 03 15:07:20 2017 +0100 (2017-11-03) |
parents | 6ee45ac02b05 |
children |
line diff
1.1 --- a/syslinux/stuff/iso2exe/init Mon Nov 21 13:31:22 2016 +0100 1.2 +++ b/syslinux/stuff/iso2exe/init Fri Nov 03 15:07:20 2017 +0100 1.3 @@ -138,7 +138,7 @@ 1.4 1.5 checkmagic() 1.6 { 1.7 - [ -s $1 ] && [ $(getarg magic) == $(get 24 $1 4) ] 1.8 + [ -s $1 ] && [ $(getarg magic) == $(get 18 $1 2) ] 1.9 } 1.10 1.11 getiso() 1.12 @@ -826,7 +826,7 @@ 1.13 gotcdfile isolinux.cfg 1.14 parse_isolinux < $file > /tmp/var$$ 1.15 . /tmp/var$$ 1.16 - for i in $media/$KERNEL $(dirname $file)/$KERNEL $media/$(locase $KERNEL) \ 1.17 + for i in /media/cdrom/$KERNEL $(dirname $file)/$KERNEL /media/cdrom/$(locase $KERNEL) \ 1.18 $(dirname $file)/$(locase $KERNEL); do 1.19 [ -s $i ] && KERNEL=$i && break 1.20 done 1.21 @@ -856,7 +856,7 @@ 1.22 if [ "$INITRD" ]; then 1.23 l=0 1.24 for i in ${INITRD//,/ }; do 1.25 - for j in $media/$i $(dirname $KERNEL)/$i $media/$(locase $i) \ 1.26 + for j in /media/cdrom/$i $(dirname $KERNEL)/$i /media/cdrom/$(locase $i) \ 1.27 $(dirname $KERNEL)/$(locase $i); do 1.28 [ -s $j ] && i=$j && break 1.29 done 1.30 @@ -912,6 +912,7 @@ 1.31 n=$(($n+1)) 1.32 done | sh 1.33 ls fd???.img 1.34 + mv fd???.img /mnt 1.35 } 1.36 1.37 fdbootstrap()