wok-next rev 17474

syslinux/iso2exe: use always mkfloppy in init
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sat Dec 27 18:25:05 2014 +0100 (2014-12-27)
parents 6aed6fc5819d
children 3cf0f7376fcf
files syslinux/stuff/iso2exe/init
line diff
     1.1 --- a/syslinux/stuff/iso2exe/init	Sat Dec 27 17:56:57 2014 +0100
     1.2 +++ b/syslinux/stuff/iso2exe/init	Sat Dec 27 18:25:05 2014 +0100
     1.3 @@ -408,7 +408,7 @@
     1.4  	R=$((1 + $(get 497 $1 1) + 1 + ($(get 500 $1)-1)/32))
     1.5  	[ $R -lt 2500 ] || return
     1.6  	[ $((($(get 500 $file)-1) & 31)) -lt 30 ] &&
     1.7 -	dd if=$file bs=32 count=1 seek=$(($R*16 - 1)) of=/dev/fd0
     1.8 +	ddq if=$file bs=32 count=1 seek=$(($R*16 - 1)) of=/dev/fd0
     1.9  	G="18 0 2 0 0 0 0 0"
    1.10  	[ $J -gt 25 ] || G=""
    1.11  	F=0
    1.12 @@ -506,11 +506,13 @@
    1.13  Please insert a floppy in drive now.\n 
    1.14  " 10 70
    1.15  	[ $? -eq 0 ] || return
    1.16 -	ddq if=/mnt/$ISO of=/dev/fd0 bs=1 count=512 \
    1.17 +	ddq if=/mnt/$ISO of=/tmp/bootiso bs=1 count=512 \
    1.18  		skip=$(( $(get 66 /mnt/$ISO) - $sz ))
    1.19 -	echo "$ISO" | ddq of=/dev/fd0 bs=512 seek=1 count=1
    1.20 -	ddq if=/mnt/$ISO of=/dev/fd0 bs=1 count=$sz seek=2 \
    1.21 +	echo "$ISO" | ddq of=/tmp/bootiso bs=512 seek=1 count=1
    1.22 +	ddq if=/mnt/$ISO of=/tmp/bootiso bs=1 count=$sz seek=2 \
    1.23  		skip=$(( $(get 66 /mnt/$ISO) - $sz + 512 ))
    1.24 +	mkfloppy /tmp/bootiso
    1.25 +	rm -f /tmp/bootiso
    1.26  }
    1.27  
    1.28  usbdev()