# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1434877920 -7200
# Node ID 87cb419b692f2effcac76db616169efaa0770f74
# Parent  7d01b006d9234c09f7219a181abcdec9f1e07380
syslinux/taziso/floppyset: fix cmdline

diff -r 7d01b006d923 -r 87cb419b692f syslinux/stuff/iso2exe/bootloader.S
--- a/syslinux/stuff/iso2exe/bootloader.S	Sat Jun 20 22:51:42 2015 +0300
+++ b/syslinux/stuff/iso2exe/bootloader.S	Sun Jun 21 11:12:00 2015 +0200
@@ -333,8 +333,8 @@
 #endif
 #endif
 #endif
+bootit:
 #ifdef MULTI_INITRD
-bootit:
         jcxz	read_sectorslp
 #endif
 
@@ -523,9 +523,9 @@
 swap_floppy:
 #ifdef COUNTER
 msg:
-	.ascii	"Insert floppy disk 00"
+	.ascii	"Insert disk 00"
 msgdigit:
-	.ascii	"1."
+	.ascii	"1 and hit Enter."
 #else
 	.ascii	"Next!"
 #endif
diff -r 7d01b006d923 -r 87cb419b692f syslinux/stuff/iso2exe/taziso
--- a/syslinux/stuff/iso2exe/taziso	Sat Jun 20 22:51:42 2015 +0300
+++ b/syslinux/stuff/iso2exe/taziso	Sun Jun 21 11:12:00 2015 +0200
@@ -1133,12 +1133,12 @@
 		words2bin $pos | ddq conv=notrunc \
 			bs=1 seek=34 count=2 of=/tmp/fd$$
 		[ $(get 518 /media/cdrom/$KERNEL 4) -ge 514 ] &&
-		words2bin $pos 9 | ddq conv=notrunc \
+		words2bin 32768 9 | ddq conv=notrunc \
 			bs=1 seek=552 count=4 of=/tmp/fd$$
 	fi
 	syssize=$(echo $(get 500 /tmp/fd$$ 4))
 	ddq bs=512 skip=$n if=/media/cdrom/$KERNEL | cat - /dev/zero | \
-	ddq bs=512 count=$((($syssize+31)/32)) >> /tmp/fd$$
+	ddq bs=512 count=$((($syssize+31)/32)) conv=sync >> /tmp/fd$$
 	base=$(stat -c %s /tmp/fd$$)
 	len=
 	if [ "$INITRD" ]; then