# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1434637861 -7200
# Node ID 83694a75d225291512f9977185b8c4ebc736afe2
# Parent  6c61376778eab5807a391fcbb557463bde8a2916
Add defragfs

diff -r 6c61376778ea -r 83694a75d225 defragfs/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/defragfs/receipt	Thu Jun 18 16:31:01 2015 +0200
@@ -0,0 +1,20 @@
+# SliTaz package receipt.
+
+PACKAGE="defragfs"
+VERSION="1.1.1"
+CATEGORY="misc"
+SHORT_DESC="Measurement and Report and Defrag fs/file fragmentation."
+MAINTAINER="pascal.bellard@slitaz.org"
+LICENSE="GPL3"
+TARBALL="$PACKAGE-$VERSION.gz"
+WEB_SITE="http://defragfs.sourceforge.net/"
+WGET_URL="http://vorboss.dl.sourceforge.net/project/$PACKAGE/$PACKAGE/$PACKAGE-${VERSION%.*}/$TARBALL"
+
+DEPENDS="perl"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	mkdir -p $fs/usr/bin
+	zcat $src/$TARBALL > $fs/usr/bin/defragfs
+}
diff -r 6c61376778ea -r 83694a75d225 syslinux/stuff/iso2exe/bootloader.S
--- a/syslinux/stuff/iso2exe/bootloader.S	Thu Jun 18 02:57:32 2015 +0300
+++ b/syslinux/stuff/iso2exe/bootloader.S	Thu Jun 18 16:31:01 2015 +0200
@@ -65,7 +65,7 @@
 	movw	$zeroed+1, %cx		# clear gdt + offset, %ds, limits, cmdline=""
 	rep				# don't worry about cld
 	stosb				# already done above
-	decw	%di
+	//decw	%di
 #else
 	movw	$zeroed/2, %cx		# clear gdt + offset, %ds, limits
 	rep				# don't worry about cld
@@ -96,6 +96,7 @@
 #
 # High doesn't hurt.  Low does.  Let's use the max: 63
 
+	cli
 	ldsw	0x78(%bx), %si		# %ds:%bx+0x78 is parameter table address
 	popw	%di
 	pushw	%es
@@ -112,7 +113,6 @@
 	popw	%ds			# now %ds = %es = %ss = INITSEG
 	popl	%fs:0x78(%bx)		# update parameter table address
 	movb	$63, 0x4-12(%di)	# patch sector count, %di = stacktop
-	cli
 
 	xchg	%ax, %di		# sector count
 	popw	%ax			# limits = 0
@@ -138,9 +138,6 @@
 	movw	$0xA33F, cmd_line_ptr-2-7(%bx)
 #endif
 	call	puts
-#if defined(MOVE_CMDLINE) || (defined(EDIT_CMDLINE) && defined(KEYBOARDLESS_SUPPORT))
-	pushw	%di
-#endif
 #ifdef	EDIT_CMDLINE
 cmdlp:
 	movb	$0x20, %al		# clear end of line
@@ -179,9 +176,6 @@
 	rep
 	  movsb
 #endif
-#if defined(EDIT_CMDLINE) || (defined(MOVE_CMDLINE) && defined(KEYBOARD_TIMEOUT))
-	popw	%di
-#endif
 nocmdline:
 #endif
 
@@ -194,7 +188,7 @@
 	movb	$0x88, %ah
 	int	$0x15
 	//jc	NeedMoreRAM			# error code 80 or 86
-	cmpw	$0xC000, %ax			# more than 49M ?
+	cmpw	$0xB000, %ax			# more than 45M ?
 	jb	NeedMoreRAM
 	movb	%ch, bootsect_dst_base_hi(%si)	# initramfs @ 32M
 	movb	%ch, ramdisk_image_ofs+3-\base
@@ -306,6 +300,7 @@
 	pushw	%bx
 	movl	-4(%bx), %ebx
 	addl	%ebx, ramdisk_size_ofs-cur_initrd_size_ofs(%di)
+	movb	$swap_floppy2-0x100, %cs:dpy_swap_floppy-2+0x7C00
 	popw	%bx
 	cmpb	2(%di), %bl
 	jb	initrdlp
@@ -409,6 +404,7 @@
 	movb	$0,%ch			# first cylinder
 	pushaw
 	movw	$swap_floppy,%si
+dpy_swap_floppy:
 #ifdef KEYBOARDLESS_SUPPORT
 	pushw	%bx
 	call	puts
@@ -419,7 +415,10 @@
 	jne	waitfloppydone
 #ifdef MULTI_INITRD
 	decb	(%si)			# max_timeouts	
-	jz	gobootit
+gobootit:
+	//movw	ramdisk_size+2-max_timeouts(%si), %cx
+	.byte	0x8B, 0x4C, ramdisk_size+2-max_timeouts
+	jz	bootit
 #endif
 	pushw	%dx			# some bios break dx...
 	cbw
@@ -442,14 +441,9 @@
 #ifdef MULTI_INITRD
 	orb	$0x20, %al
 	cmp	$'b', %al
-        jnz	read_sectorslp
-gobootit:
-	//movw	ramdisk_size+2-max_timeouts(%si), %cx
-	.byte	0x8B, 0x4C, ramdisk_size+2-max_timeouts
-	jmp	bootit
-#else
+        jz	gobootit
+#endif
         jmp	read_sectorslp
-#endif
 
 putcdot:
 	movb	$'.'+3, %al	// . = success, - = failure
@@ -496,10 +490,11 @@
 	jg	putcs
 	ret	
 
-swap_floppy:
 #ifdef MULTI_INITRD
+swap_floppy2:
 	.ascii	"B or "
 #endif
+swap_floppy:
 	.ascii	"Next!"
 	.byte	7,13,0			# swap detection needs 13, 0
 #ifdef MULTI_INITRD
diff -r 6c61376778ea -r 83694a75d225 syslinux/stuff/iso2exe/taziso
--- a/syslinux/stuff/iso2exe/taziso	Thu Jun 18 02:57:32 2015 +0300
+++ b/syslinux/stuff/iso2exe/taziso	Thu Jun 18 16:31:01 2015 +0200
@@ -1057,6 +1057,17 @@
 parse_isolinux()
 {
 	awk 'BEGIN { IGNORECASE=1 }
+function multi(n)
+{
+	auto=$n
+	for (--n; n < NF; n+=2) {
+		s=$n
+		if (s ~ /M$/) s = substr(s,0,length(s)-1)
+		else s /= 1024
+		sizes=int(s) " " sizes
+	}
+	next
+}
 {
 	if ($1 == "LABEL") {
 		label=$2
@@ -1066,13 +1077,10 @@
 	if ($1 == "INITRD") initrd[label]=$2
 	if ($1 == "APPEND") {
 		i=2
-		if (kernel[label] ~ "ifmem.c32") {
-			auto=$3
-			next
-		}
+		if (kernel[label] ~ "ifmem.c32") multi(3)
 		if (kernel[label] ~ "c32box.c32") {
 			if ($2 == "linux") { kernel[label]=$3; i=4 }
-			if ($2 == "ifmem") { auto=$4; next }
+			if ($2 == "ifmem") multi(4)
 		}
 		if (kernel[label] ~ "ifcpu64.c32") { auto=$4; next }
 		while (i <= NF) {
@@ -1086,6 +1094,7 @@
 	print "KERNEL=\"" kernel[auto] "\""
 	print "INITRD=\"" initrd[auto] "\""
 	print "CMDLINE=\"" substr(cmdline[auto],2) "\""
+	print "SIZES=\"" sizes "\""
 }'
 }