wok-current rev 18155

syslinux/taziso/floppyset: fix cmdline
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun Jun 21 11:12:00 2015 +0200 (2015-06-21)
parents 7d01b006d923
children 67c7ead92b02
files syslinux/stuff/iso2exe/bootloader.S syslinux/stuff/iso2exe/taziso
line diff
     1.1 --- a/syslinux/stuff/iso2exe/bootloader.S	Sat Jun 20 22:51:42 2015 +0300
     1.2 +++ b/syslinux/stuff/iso2exe/bootloader.S	Sun Jun 21 11:12:00 2015 +0200
     1.3 @@ -333,8 +333,8 @@
     1.4  #endif
     1.5  #endif
     1.6  #endif
     1.7 +bootit:
     1.8  #ifdef MULTI_INITRD
     1.9 -bootit:
    1.10          jcxz	read_sectorslp
    1.11  #endif
    1.12  
    1.13 @@ -523,9 +523,9 @@
    1.14  swap_floppy:
    1.15  #ifdef COUNTER
    1.16  msg:
    1.17 -	.ascii	"Insert floppy disk 00"
    1.18 +	.ascii	"Insert disk 00"
    1.19  msgdigit:
    1.20 -	.ascii	"1."
    1.21 +	.ascii	"1 and hit Enter."
    1.22  #else
    1.23  	.ascii	"Next!"
    1.24  #endif
     2.1 --- a/syslinux/stuff/iso2exe/taziso	Sat Jun 20 22:51:42 2015 +0300
     2.2 +++ b/syslinux/stuff/iso2exe/taziso	Sun Jun 21 11:12:00 2015 +0200
     2.3 @@ -1133,12 +1133,12 @@
     2.4  		words2bin $pos | ddq conv=notrunc \
     2.5  			bs=1 seek=34 count=2 of=/tmp/fd$$
     2.6  		[ $(get 518 /media/cdrom/$KERNEL 4) -ge 514 ] &&
     2.7 -		words2bin $pos 9 | ddq conv=notrunc \
     2.8 +		words2bin 32768 9 | ddq conv=notrunc \
     2.9  			bs=1 seek=552 count=4 of=/tmp/fd$$
    2.10  	fi
    2.11  	syssize=$(echo $(get 500 /tmp/fd$$ 4))
    2.12  	ddq bs=512 skip=$n if=/media/cdrom/$KERNEL | cat - /dev/zero | \
    2.13 -	ddq bs=512 count=$((($syssize+31)/32)) >> /tmp/fd$$
    2.14 +	ddq bs=512 count=$((($syssize+31)/32)) conv=sync >> /tmp/fd$$
    2.15  	base=$(stat -c %s /tmp/fd$$)
    2.16  	len=
    2.17  	if [ "$INITRD" ]; then