# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1368116168 -7200
# Node ID e6e4be1b259123f54abfbad28da83e6e99d418c9
# Parent  28c1b40cf593b5d90a834dd8c045d73863576bb4
mirror/floppies: updates from web site, add loram for 1.0 & 2.0

diff -r 28c1b40cf593 -r e6e4be1b2591 mirror/floppies/4.0/description.html
--- a/mirror/floppies/4.0/description.html	Wed May 01 10:50:21 2013 +0200
+++ b/mirror/floppies/4.0/description.html	Thu May 09 18:16:08 2013 +0200
@@ -3,7 +3,7 @@
 </p>
 <ul>
   <li>
-  <b>base</b> needs 48Mb of RAM and 7 floppies: <i>fd001.img</i> to <i>fd006.img</i>.<br />
+  <b>base</b> needs 48Mb of RAM and 6 floppies: <i>fd001.img</i> to <i>fd006.img</i>.<br />
   base provides the minimum slitaz distribution subset in text mode. 
   </li>
   <li>
diff -r 28c1b40cf593 -r e6e4be1b2591 mirror/floppies/builder/bootloader
--- a/mirror/floppies/builder/bootloader	Wed May 01 10:50:21 2013 +0200
+++ b/mirror/floppies/builder/bootloader	Thu May 09 18:16:08 2013 +0200
@@ -9,187 +9,274 @@
 usage()
 {
 cat <<EOT
-Usage: $0 bzImage [--prefix image_prefix] [--cmdline 'args']
+Usage: $0 bzImage [--prefix image_prefix] [--info file ]
+       [--format 1200|1440|1680|1920|2880|... ] [--mem mb]
        [--rdev device] [--video mode] [--flags rootflags] [--tracks cnt]
-       [--format 1440|1680|1920|2880 ] [--initrd initrdfile]...
+       [--cmdline 'args'] [--dont-edit-cmdline] [--no-syssize-fix]
+       [--address-initrd address] [--initrd initrdfile]...
 
-Default values: --format 1440 --tracks 80 --prefix floppy.
+Default values: --format 1440 --tracks 80 --rdev /dev/fd0 --prefix floppy. --mem 16
 
 Example:
-$0 /boot/vmlinuz-2.6.30.6 --rdev /dev/ram0 --video -3 --cmdline 'rw lang=fr_FR kmap=fr-latin1 laptop autologin' --initrd /boot/rootfs.gz --initrd ./myconfig.gz
+$0 /boot/bzImage --rdev /dev/ram0 --video -3 --cmdline 'rw lang=fr_FR kmap=fr-latin1 laptop autologin' --initrd /boot/rootfs.gz --initrd ./myconfig.gz
 EOT
 exit 1
 }
 
 KERNEL=""
 INITRD=""
+ADRSRD=""
 CMDLINE=""
 PREFIX="floppy."
 FORMAT="1440"
 RDEV=""
 VIDEO=""
 FLAGS=""
-TRACKS=""
+TRACKS="80"
+MEM="16"
+NOEDIT=""
+NOSYSSIZEFIX=""
+INFOFILE=""
 DEBUG=""
 while [ -n "$1" ]; do
-	case "$1" in
-	--c*|-c*)  CMDLINE="$2"; shift;;
-	--i*|-i*)  INITRD="$INITRD $2"; shift;;
-	--p*|-p*)  PREFIX="$2"; shift;;
-	--fo*|-f*) FORMAT="$2"; shift;;
-	--fl*)     FLAGS="$2"; shift;;	# 1 read-only, 0 read-write
-	--r*|-r*)  RDEV="$2"; shift;;	# /dev/???
-	--v*|-v*)  VIDEO="$2"; shift;;	# -3 .. n
-	--t*|-t*)  TRACKS="$2"; shift;; # likely 81 .. 84
-	--debug)   DEBUG="1";;
+	case "${1/--/-}" in
+	-c*) CMDLINE="$2"; shift;;
+	-inf*) INFOFILE="$2"; shift;;
+	-i*) INITRD="$INITRD $2"; shift;;
+	-a*) ADRSRD="$2"; shift;;
+	-h*) HEAP="$2"; shift;;
+	-l*) LOADERTYPE="$2"; shift;;
+	-p*) PREFIX="$2"; shift;;
+	-fl*)FLAGS="$2"; shift;;	# 1 read-only, 0 read-write
+	-f*) FORMAT="$2"; shift;;
+	-m*) MEM="$(echo $2 | sed 's/[^0-9]//g')"; shift;;
+	-r*) RDEV="$2"; shift;;
+	-v*) VIDEO="$2"; shift;;	# -3 .. n
+	-t*) TRACKS="$2"; shift;; # likely 81 .. 84
+	-n*) NOSYSSIZEFIX="1";;
+	-debug) DEBUG="1";;
+	-d*) NOEDIT="1";;
 	*) KERNEL="$1";;
 	esac
 	shift
 done
 [ -n "$KERNEL" -a -f "$KERNEL" ] || usage
-if [ -n "$TRACKS" ]; then
-	if [ $(( $FORMAT % $TRACKS )) -ne 0 ]; then
-		echo "Invalid track count for format $FORMAT."
-		usage
-	fi
+while [ -L "$KERNEL" ]; do KERNEL="$(readlink "$KERNEL")"; done
+if [ $(( $FORMAT % $TRACKS )) -ne 0 ]; then
+	echo "Invalid track count for format $FORMAT."
+	usage
 fi
+[ 0$MEM -lt 4  ] && MEM=4
+[ $MEM -gt 16 ] && MEM=16
 
-# write a 16 bits data
-# usage: store16 offset data16 file
-store16()
+ddq() { dd $@ 2> /dev/null; }
+
+patch()
 {
-	echo $(( $2 + 0x10000 )) | \
-		awk '{ printf "\\\\x%02X\\\\x%02X",$1%256,($1/256)%256 }' | \
-		xargs echo -en | \
-	dd bs=2 conv=notrunc of=$3 seek=$(( $1 / 2 )) 2> /dev/null
-	[ -n "$DEBUG" ] && printf "store16(%04X) = %04X\n" $1 $2 1>&2
+	echo -en $(echo ":$2" | sed 's/:/\\x/g') | \
+		ddq bs=1 conv=notrunc of=$3 seek=$((0x$1))
+	[ -n "$DEBUG" ] && echo "patch $1 $2		$4" 1>&2
 }
 
-# write a 32 bits data
-# usage: storelong offset data32 file
-storelong()
+# usage: store bits offset data file
+store()
 {
-	echo $2 | awk '{ printf "\\\\x%02X\\\\x%02X\\\\x%02X\\\\x%02X",
-		 $1%256,($1/256)%256,($1/256/256)%256,($1/256/256/256)%256 }' | \
-		xargs echo -en | \
-		dd bs=4 conv=notrunc of=$3 seek=$(( $1 / 4 )) 2> /dev/null
-	[ -n "$DEBUG" ] && printf "storelong(%04X) = %08X\n" $1 $2 1>&2
+	n=$3; for i in $(seq 8 8 $1); do
+		printf '\\\\x%02X' $(($n & 255))
+		n=$(($n >> 8))
+	done | xargs echo -en | ddq bs=1 conv=notrunc of=$4 seek=$(($2))
+	[ -n "$DEBUG" ] && printf "store%d(%03X) = %0$(($1/4))X	%s\n" $1 $2 $3 "$5" 1>&2
 }
 
-# read a 32 bits data
 # usage: getlong offset file
 getlong()
 {
-	dd if=$2 bs=1 skip=$(( $1 )) count=4 2> /dev/null | \
-		hexdump -e '"" 1/4 "%d" "\n"'
+	ddq if=$2 bs=1 skip=$(($1)) count=4 | hexdump -e '"" 1/4 "%d" "\n"'
+}
+
+error()
+{
+	echo $@ 1>&2
+	rm -f $bs
+	exit 1
 }
 
 floppyset()
 {
 	# bzImage offsets
-	CylinderCount=496
 	SetupSzOfs=497
 	FlagsOfs=498
-	SyssizeOfs=500
 	VideoModeOfs=506
 	RootDevOfs=508
-	CodeAdrOfs=0x214
+	Magic=0x202
 	RamfsAdrOfs=0x218
 	RamfsLenOfs=0x21C
-	ArgPtrOfs=0x228
 
 	# boot+setup address
 	SetupBase=0x90000
 
-	stacktop=0x9E00
-
 	bs=/tmp/bs$$
 
 	# Get and patch boot sector
-	# See  http://hg.slitaz.org/wok/raw-file/711d076b277c/linux/stuff/linux-header-2.6.34.u
-	dd if=$KERNEL bs=512 count=1 of=$bs 2> /dev/null
-	uudecode <<EOT | dd of=$bs conv=notrunc 2> /dev/null
+	# See http://hg.slitaz.org/wok/raw-file/66e38bd6a132/linux/stuff/linux-header.u
+	[ -n "$DEBUG" ] && echo "Read bootsector..." 1>&2
+	ddq if=$KERNEL bs=512 count=1 of=$bs
+
+	[ $(( $(getlong 0x1FE $bs) & 0xFFFF )) -eq 43605 ] ||
+		error "Not bootable"
+	
+	uudecode <<EOT | ddq of=$bs conv=notrunc
 begin-base64 644 -
-/L+6nWgAkAcGF4n8McC5HQDzq1sfD6mg8X1ABlfFd3ixBvOlZWaPR3gGH8ZF
-+D/6l1hB6DQBvgACA3QO6HYBWwseKAJ0LFNH6AoBXuhmAbAgzRCwCM0QTuhl
-ATwIdAOIBK05NigCdPDoPgE8CnXgiHz+ieb/TBD/TBi/9AGBTRz/gMdFMACc
-sBCxBUi0k4lEHLABiUQUmGaY0+BIZgMFZtPoaAAQB7+AACn4nHMCAccx21BW
-6J4AXrkAgLSH/kQczRVYnXfcoRoCvxwCsQk4RBxyuJPNE+oAACCQsEYoyL7b
-AejSAF3rI4D5E3IEOMF3a4D+AnIEOOZ3bGCB/QAGdCoGUlFTlrQCULEGtQTB
-xQSwDyHoBJAnFEAn6IwA/s117LAgzRDitOiWAJjNE2FSUCjIdwKwAZg5+HIC
-ifhQtALNE5VeWFpyoJVBjuGAxwJPdFFOdfSM4ZU4wXVFiMj+xrEBOOZ1O4j0
-/sW2AID9UHIwOi7wAXIqtQBgvt4B/kQMU+gxAFvoOAB1FlKYzRO4AQLNE1rQ
-1Dpk/nXqRgjkdeVh64sWB7AxLAO0DrsHAM0QPA1088OwDejv/6wIwHX4w79s
-BLFbZQINuA0BZToNdArNFnT0mM0Wju9Hw1g6AEluc2VydCBkaXNrIDEuBw0A
-AA==
+/L+4nWgAkBeJ/BYHMcC5HgDzq1sfD6Gg8X1AxXd4BlexBvOlFh9kZo9HeMZF
++D/6l1hB6DwBvgACgUwQIIDGRCWbA3QO6GoBWwseKAJ0LFNH6AYBXuhaAbAg
+zRCwCM0QTuhZATwIdAOIBK05NigCdPDoMgE8CnXgiHz+W4nm/0gQxkAVk4Dz
+CHX0u/QBoRUCsQVmix9mS2bT60NoAAgHv4AAiXwTiUQbAfjR7yn7nHMCAd9Q
+V1ZTMdvongBbXlmGzbSHFgfNFVidd9ChGQK7HAKxCTlEG3K6l80T6gAAIJCw
+RijIvtgB6MoAXesjgPkTcgQ4wXdrgP4CcgQ45ndsYIH9AAZ0KgZSUVOWtAJQ
+sQa1BMHFBLAPIegEkCcUQCfohAD+zXXssCDNEOK06I4AmM0TYVJQKMh3ArAB
+mDn4cgKJ+FC0As0TlV5YWnKglUGO6YDHAk90S0519IzplTjBdT+IyP7GsQE4
+5nU1iPT+xYD9ULYAdSq1AGC+2wH+RAxT6C8AW+g2AHUWUpjNE7gBAs0TWtDU
+OmT+depGCOR15WHrkbAxLAO0DrsHAM0QPA1088OwDejv/6wIwHX4w79sBLFb
+ZAINuA0BZDoNdArNFnT0mM0WjudHw1g6AEluc2VydCBkaXNrIDEHDQA=
 ====
 EOT
+	# Get setup
+	setupsz=$(( $(getlong $SetupSzOfs $bs) & 0xFF ))
+	if [ $setupsz -eq 0 ]; then
+		setupsz=4
+		store 8 $SetupSzOfs $setupsz $bs "setup size $setupsz"
+	fi
+	[ -n "$DEBUG" ] && echo "Read setup ($setupsz sectors) ..." 1>&2
+	ddq if=$KERNEL bs=512 skip=1 count=$setupsz >> $bs
 
-	# Get setup
-	setupsz=$(getlong $SetupSzOfs $bs)
-	setupszb=$(( $setupsz & 255 ))
-	dd if=$KERNEL bs=512 skip=1 count=$setupszb 2> /dev/null >> $bs
+	Version=$(( $(getlong 0x206 $bs) & 0xFFFF ))
+	[ $(getlong $Magic $bs) -ne 1400005704 ] && Version=0
+	feature=""
+	while read prot kern info ; do
+		[ $Version -lt $((0x$prot)) ] && continue
+		feature="features $prot starting from kernel $kern "
+	done <<EOT
+200	1.3.73	kernel_version, bzImage, initrd, loadflags/type_of_loader
+201	1.3.76	heap_end_ptr
+202	2.4.0	new cmdline
+204	2.6.14	long syssize
+EOT
+	[ -n "$DEBUG" ] && printf "Protocol %X $feature\n" $Version 1>&2
+	
+	# Old kernels need bootsector patches to disable rescent features
+	while read minversion maxversion offset bytes rem; do
+		[ $Version -gt $(( 0x$maxversion )) ] && continue
+		[ $Version -lt $(( 0x$minversion )) ] && continue
+		patch $offset $bytes $bs "$rem"
+	done <<EOT
+000 1FF 08D	B8:00:01			force zImage (movw \$0x100, %ax)
+000 1FF 0CB	EB:0B				skip initrd code 
+000 201 01E	EB:1E:00:00:00:00		room for the cmdline magic
+000 201 036	BE:00:00:E8:76:01:EB:0A:06:57:B1:06:F3:A5:EB:DE	code in cmdline magic moved
+000 1FF 039	90:90:90			no kernel version
+000 201 04B	22:00				old cmdline ptr 1
+000 201 06D	22:00				old cmdline ptr 2
+000 203 1F6	00:00 				syssize32
+200 FFF 210	FF				type_of_loader=FF
+201 FFF 224	00:9B				heap_end_ptr
+EOT
+	if [ $Version -lt 514 ]; then
+		version_string=$((0x200 + ($(getlong 0x20E $bs) & 65535) ))
+		store	16	0x0037	$version_string	$bs version_string
+	fi
+	if [ $Version -ge 512 -a $(getlong 0x214 $bs) -ge $((0x100000)) ]; then 
+		patch	211	81	$bs	loadflags=can_use_heap+loadhigh
+		patch	09D	10	$bs	LOADSEG=0x1000
+		patch	0A0	00:01	$bs	LOADSZ=0x10000
+	fi
+	[ -n "$CMDLINE" ] || patch 04D EB $bs "No cmdline"
+	[ -n "$NOEDIT" ] && patch 059 0D:46:EB:14 $bs 'mov CR,%al ; inc %si; jmp putal'
+	[ 1$TRACKS -ne 180 ] &&	store	8	0x171		$TRACKS $bs TRACKS
+	
+	[ -n "$FLAGS" ] &&	store	16	$FlagsOfs	$FLAGS $bs FLAGS
+	[ -n "$VIDEO" ] &&	store	16	$VideoModeOfs	$VIDEO $bs VIDEO
+	[ -n "$RDEV" ] || case "$FORMAT" in
+		1200)	RDEV=0x0208 ;;
+		1440)	RDEV=0x021C ;;
+		2880)	RDEV=0x0220 ;;
+		*)	RDEV=0x0200 ;;
+	esac
+	while [ -L "$RDEV" ]; do RDEV="$(readlink "$RDEV")"; done
+	[ -b "$RDEV" ] && RDEV=$(stat -c '0x%02t%02T' $RDEV 2> /dev/null)
+	store 16 $RootDevOfs $RDEV $bs RDEV
 
-	if [ -n "$TRACKS" ]; then
-		[ -n "$DEBUG" ] && echo -n "--tracks " 1>&2
-		n=$(getlong $CylinderCount $bs)
-		store16 $CylinderCount $(( ($n & -256) + $TRACKS )) $bs
-	fi
-	if [ -n "$FLAGS" ]; then
-		[ -n "$DEBUG" ] && echo -n "--flags " 1>&2
-		store16 $FlagsOfs $FLAGS $bs
-	fi
-	if [ -n "$VIDEO" ]; then
-		[ -n "$DEBUG" ] && echo -n "--video " 1>&2
-		store16 $VideoModeOfs $VIDEO $bs
-	fi
-	if [ -n "$RDEV" ]; then
-		if [ "$(dirname $RDEV)" == "/dev" -a -b $RDEV ]; then
-			[ -n "$DEBUG" ] && echo -n "--rdev " 1>&2
-			RDEV=$(stat -c '0x%02t%02T' $RDEV 2> /dev/null)
-			store16 $RootDevOfs $RDEV $bs
+	[ $FORMAT -lt 1440 ] && store 8 0xEF  16	 $bs	1.2M
+	[ $FORMAT -lt 1200 ] && store 8 0xEF  10	 $bs	720K
+	[ $FORMAT -lt 720  ] && store 8 0x171 40	 $bs	360K
+	[ $FORMAT -lt 360  ] && store 8 0xEF  9		 $bs	320K
+	[ $FORMAT -lt 320  ] && store 8 0xF8  2		 $bs	160K
+	
+	# Info text after setup
+	if [ -s "$INFOFILE" ]; then
+		patch	048	9a:00:00:00:90	$bs	lcall displayinfo
+		uudecode >$bs.infotext <<EOT
+begin-base64 644 -
+MdsGYI7D6AAAXoHGSgCJ8MHoCUii8QGwDbQOuwcAzRCsPAx1I79sBLFbJgIN
+uBsBJjoNdAnNFnT0mM0Wjsc8IHPjPBt0BuvPCMB1zWEHCx4oAss=
+====
+EOT
+		cat "$INFOFILE" >>$bs.infotext
+		if [ $Version -lt 514 ]; then
+			store 16 0x050 0x0022 $bs.infotext 
 		fi
+		ddq if=/dev/zero bs=512 count=1 >>$bs.infotext
+		n=$(($(stat -c %s $bs.infotext)/512))
+		ddq if=$bs.infotext count=$n bs=512 >> $bs
+		rm -f $bs.infotext
+		store 8 0x1F1  $(($setupsz+$n))	 $bs	update setup size
+		store 8 0x04A  $((2+2*$setupsz)) $bs	update displayinfo call
 	fi
 
-	# Store cmdline after setup
+	# Store cmdline after setup for kernels >= 0.99
 	if [ -n "$CMDLINE" ]; then
-		[ -n "$DEBUG" ] && echo -n "--cmdline '$CMDLINE' " 1>&2
-		echo -n "$CMDLINE" | dd bs=512 count=1 conv=sync 2> /dev/null >> $bs
-		storelong $ArgPtrOfs $(( $SetupBase + $stacktop )) $bs
+		echo -n "$CMDLINE" | ddq bs=512 count=1 conv=sync >> $bs
+		CmdlineOfs=0x9E00	# Should be in 0x8000 .. 0xA000
+		ArgPtrOfs=0x228
+		ArgPtrVal=$(( $SetupBase + $CmdlineOfs ))
+		if [ $Version -lt 514 ]; then
+			ArgPtrOfs=0x0020
+			ArgPtrVal=$(( 0xA33F + ($CmdlineOfs << 16) ))
+		fi
+		store 32 $ArgPtrOfs $ArgPtrVal $bs "Cmdline '$CMDLINE'"
 	fi
 
-	# Compute initramfs size
+	# Compute initramfs size (protocol >= 2.00)
+	[ $Version -lt 512 ] && INITRD=""
 	initrdlen=0
+INITRDPAD=4
+INITRDALIGN=0x1000
 	for i in $( echo $INITRD | sed 's/,/ /' ); do
 		[ -s "$i" ] || continue
-		[ -n "$DEBUG" ] && echo "--initrd $i " 1>&2
-		initrdlen=$(( ($initrdlen + $(stat -c %s $i) + 3) & -4 ))
+		while [ -L "$i" ]; do i="$(readlink $i)"; done
+		size=$(( ($(stat -c %s "$i") + $INITRDPAD - 1) & -$INITRDPAD ))
+		[ -n "$DEBUG" ] && echo "initrd $i $size " 1>&2
+		initrdlen=$(( $initrdlen + $size ))
+		[ -n "$ADRSRD" ] || ADRSRD=$(( (($MEM * 0x100000) - $initrdlen) & -$INITRDALIGN ))
+		store 32 $RamfsAdrOfs $(( $ADRSRD )) $bs initrd adrs
+		store 32 $RamfsLenOfs $initrdlen $bs initrdlen
 	done
-	if [ $initrdlen -ne 0 ]; then
-		[ -n "$DEBUG" ] && echo "initrdlen = $initrdlen " 1>&2
-		storelong $RamfsAdrOfs \
-			$(( (0x1000000 - $initrdlen) & 0xFFFF0000 )) $bs
-		storelong $RamfsLenOfs $initrdlen $bs
-	fi
+
+	[ -n "$NOSYSSIZEFIX" ] || store 32 0x1F4 \
+		$(( ($(stat -c %s $KERNEL)+15)/16 - ($setupsz+1)*32)) $bs fix system size
 
 	# Output boot sector + setup + cmdline
-	dd if=$bs 2> /dev/null
+	ddq if=$bs
 
 	# Output kernel code
-	dd if=$KERNEL bs=512 skip=$(( $setupszb + 1 )) 2> /dev/null
-
-	# Pad to next sector
-	Kpad=$(( 512 - ($(stat -c %s $KERNEL) & 511) ))
-	[ $Kpad -eq 512 ] || dd if=/dev/zero bs=1 count=$Kpad 2> /dev/null
+	syssz=$(( ($(getlong 0x1F4 $bs)+31)/32 ))
+	cat $KERNEL /dev/zero | ddq bs=512 skip=$(( $setupsz+1 )) count=$syssz conv=sync
 
 	# Output initramfs
-	padding=0
 	for i in $( echo $INITRD | sed 's/,/ /' ); do
 		[ -s "$i" ] || continue
-		[ $padding -ne 0 ] && dd if=/dev/zero bs=1 count=$padding 2> /dev/null
-		dd if=$i 2> /dev/null
-		padding=$(( 4 - ($(stat -c %s $i) & 3) ))
-		[ $padding -eq 4 ] && padding=0
+		ddq if=$i
+		padding=$(( $INITRDPAD - ($(stat -c %s $i) % $INITRDPAD) ))
+		[ $padding -eq $INITRDPAD ] || ddq if=/dev/zero bs=1 count=$padding
 	done
 
 	# Cleanup
@@ -199,14 +286,14 @@
 if [ "$FORMAT" == "0" ]; then # unsplitted
 	floppyset > $PREFIX
 	PAD=$(( 512 - ($(stat -c %s $PREFIX) % 512) ))
-	[ $PAD -ne 512 ] && dd if=/dev/zero bs=1 count=$PAD >> $PREFIX 2> /dev/null
+	[ $PAD -ne 512 ] && ddq if=/dev/zero bs=1 count=$PAD >> $PREFIX
 	exit
 fi
 floppyset | split -b ${FORMAT}k /dev/stdin floppy$$
 i=1
-ls floppy$$* | while read file ; do
+ls floppy$$* 2> /dev/null | while read file ; do
 	output=$PREFIX$(printf "%03d" $i)
-	cat $file /dev/zero | dd bs=1k count=$FORMAT conv=sync of=$output 2> /dev/null
+	cat $file /dev/zero | ddq bs=1k count=$FORMAT conv=sync of=$output
 	echo $output
 	rm -f $file
 	i=$(( $i + 1 ))
diff -r 28c1b40cf593 -r e6e4be1b2591 mirror/floppies/builder/index.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mirror/floppies/builder/index.html	Thu May 09 18:16:08 2013 +0200
@@ -0,0 +1,1 @@
+index.php
\ No newline at end of file
diff -r 28c1b40cf593 -r e6e4be1b2591 mirror/floppies/builder/index.php
--- a/mirror/floppies/builder/index.php	Wed May 01 10:50:21 2013 +0200
+++ b/mirror/floppies/builder/index.php	Thu May 09 18:16:08 2013 +0200
@@ -12,6 +12,7 @@
 	<meta name="author" content="SliTaz Contributors" />
 	<meta http-equiv="Refresh" content="0;url=http://mirror.slitaz.org/floppies/builder/index.php">
 </head>
+</html>
 <?php
 }
 ini_set('upload_max_filesize','16M');
@@ -46,8 +47,8 @@
 	<meta name="description" content="slitaz boot floppies builder" />
 	<meta name="robots" content="index, nofollow" />
 	<meta name="author" content="SliTaz Contributors" />
-	<link rel="shortcut icon" href="/static/favicon.ico" />
-	<link rel="stylesheet" type="text/css" href="/static/slitaz.css" />
+	<link rel="shortcut icon" href="../static/favicon.ico" />
+	<link rel="stylesheet" type="text/css" href="../static/slitaz.css" />
 	<style type="text/css">
 	
 input[type=text] {
@@ -80,7 +81,7 @@
 	<div id="logo"></div>
 	<div id="network">
 		<a href="http://www.slitaz.org/">
-		<img src="/static/home.png" alt="[ home ]" /></a>
+		<img src="../static/home.png" alt="[ home ]" /></a>
 		<a href="bootloader" title="Build your floppy sets without Internet">Shell builder</a> |
 		<a href="../floppy-grub4dos" title="Boot tools">Generic boot floppy</a>
 	</div>
@@ -129,6 +130,7 @@
 
 	$size = 0;
 	$initrd_size = 0;
+	$info_size = 0;
 	
 	// Upload kernel
 	
@@ -162,24 +164,21 @@
 				   $tmp_dir."kernel");
 		$kernel = $tmp_dir."kernel";
 		$boot_version = get_long($kernel,0x206) & 255;
+		if (get_long($kernel,0x202) != 0x53726448) // 'HdrS' magic
+			$boot_version = 0;
 		$size = get_long($kernel,0x1F4);	// syssize paragraphs
 		if ($boot_version < 4) $size &= 0xFFFF;	// 16 bits before 2.4
 		$size = ($size + 0xFFF) & 0xFFFF000;	// round up to 64K
 		$size <<= 4;				// paragraphs -> bytes
-		if (get_long($kernel,0x202) != 0x53726448 ||	// 'HdrS' magic
-		    (get_long($kernel,0x211) & 1 != 1)) {	// bzImage flag
-			error("The file ".$_FILES["kernel"]['name'].
-			      " is not a bzImage Linux kernel.");
-			$size = 0;
-		}
-		else if ($boot_version < 2 && $_POST['cmdline']) { // before 2.2
-			unset($_POST['cmdline']);
-			error("This boot loader does not support Linux kernel ".
-			      "prior 2.4.0-test3-pre3 command line.",
-			      "Warning");
-		}
 		$msg = "The size of the file ".$_FILES["kernel"]['name'];
 	}
+
+	if ($size && isset($_FILES["info"]['tmp_name']) &&
+	    is_uploaded_file($_FILES["info"]['tmp_name'])) {
+		move_uploaded_file($_FILES["info"]['tmp_name'],
+				   $tmp_dir."info");
+		$info_size = $_FILES["info"]['size'];
+	}
 	
 	// Upload initrd
 	
@@ -213,9 +212,13 @@
 	else {
 		$cmd = "./bootloader ".$tmp_dir."kernel --prefix "
 		     . $tmp_dir."fd --format 0 --flags ".$_POST['flags']
-		     . " --video ".$_POST['video'];
+		     . " --video ".$_POST['video']." --mem ".$_POST['ram'];
+		if ($_POST['edit'] == "")
+			$cmd .= " --dont-edit-cmdline";
 		if ($_POST['cmdline'])
 			$cmd .= " --cmdline '".$_POST['cmdline']."'";
+		if ($info_size)
+			$cmd .= " --info ".$tmp_dir."info";
 		if (file_exists($_POST['rdev']))
 			$cmd .= " --rdev ".$_POST['rdev'];
 		if ($initrd_size)
@@ -278,7 +281,7 @@
 		$max = rtrim(ini_get('upload_max_filesize'),"M");
 		$max_post = rtrim(ini_get('post_max_size'),"M");
 		if ($max_post < $max) $max = $max_post;
-		$msg = "the tiny boot loader can't load more than 15 MB";
+		$msg = "the <acronym title=\"The linux kernel boot sector\">tiny boot loader</acronym> can't load more than 15 MB";
 		if ($max < 16)
 			$msg = "the web server can't upload more than $max MB";
 ?>
@@ -286,21 +289,26 @@
 <table>
 	<tr>
 	<td>Linux kernel:</td>
-	<td><input type="file" name="kernel" size="25" /> <i>required</i></td>
+	<td><input type="file" name="kernel" size="37" /> <i>required</i></td>
 	</tr>
 	<tr>
 	<td>Initramfs / Initrd:</td>
-	<td><input type="file" name="initrd" size="25" /> <i>optional</i></td>
+	<td><input type="file" name="initrd" size="37" /> <i>optional</i></td>
 	</tr>
 	<tr>
 	<td>Extra initramfs:</td>
-	<td><input type="file" name="initrd2" size="25" /> <i>optional</i></td>
+	<td><input type="file" name="initrd2" size="37" /> <i>optional</i></td>
+	</tr>
+	<tr>
+	<td>Boot message:</td>
+	<td><input type="file" name="info" size="37" /> <i>optional</i></td>
 	</tr>
 	<tr>
 	<td>Default cmdline:</td>
 	<td><input type="text" name="cmdline" size="36" <?php 
 		if (isset($_GET['cmdline'])) echo 'value="'.$_GET['cmdline'].'"';
-	?>/> <i>optional</i></td>
+	?>/> <input type="checkbox" name="edit" checked="checked" />edit
+	<i>optional</i></td>
 	</tr>
 	<tr>
 	<td>Root device:</td>
@@ -333,41 +341,89 @@
 			$options[0xF07] = "80x60";
 			$options[0x30A] = "132x43";
 			$options[0x309] = "132x25";
-			$options[0x338] = "320x200x8";
+			$options[0x338] = "320x200x8"; // 382?
 			$options[0x30D] = "320x200x15";
 			$options[0x30E] = "320x200x16";
-			$options[0x332] = "320x240x8";
-			$options[0x335] = "320x240x16";
-			$options[0x333] = "400x300x8";
-			$options[0x336] = "400x300x16";
-			$options[0x334] = "512x384x8";
-			$options[0x337] = "512x384x16";
+			$options[0x30F] = "320x200x24";
+			$options[0x320] = "320x200x32";
+			$options[0x332] = "320x240x8"; // 392?
+			$options[0x393] = "320x240x15";
+			$options[0x335] = "320x240x16";// 394?
+			$options[0x395] = "320x240x24";
+			$options[0x396] = "320x240x32";
+			$options[0x333] = "400x300x8";// 3A2?
+			$options[0x3A3] = "400x300x15";
+			$options[0x336] = "400x300x16";// 3A4?
+			$options[0x3A5] = "400x300x24";
+			$options[0x3A6] = "400x300x32";
+			$options[0x334] = "512x384x8";// 3B2?
+			$options[0x3B3] = "512x384x15";
+			$options[0x337] = "512x384x16";// 3B4?
+			$options[0x3B5] = "512x384x24";
+			$options[0x3B6] = "512x384x32";
+			$options[0x3C2] = "640x350x8";
+			$options[0x3C3] = "640x350x15";
+			$options[0x3C4] = "640x350x16";
+			$options[0x3C5] = "640x350x24";
+			$options[0x3C6] = "640x350x32";
 			$options[0x300] = "640x400x8";
-			$options[0x339] = "640x400x16";
+			$options[0x383] = "640x400x15";
+			$options[0x339] = "640x400x16";// 384?
+			$options[0x385] = "640x400x24";
+			$options[0x386] = "640x400x32";
 			$options[0x301] = "640x480x8";
 			$options[0x310] = "640x480x15";
 			$options[0x311] = "640x480x16";
 			$options[0x312] = "640x480x24";
-			$options[0x33A] = "640x480x32";
+			$options[0x33A] = "640x480x32";// 321?
+			$options[879]   = "800x500x8";
+			$options[880]   = "800x500x15";
+			$options[881]   = "800x500x16";
+			$options[882]   = "800x500x24";
+			$options[883]   = "800x500x32";
 			//$options[770] = "800x600x4";
 			$options[0x303] = "800x600x8";
 			$options[0x313] = "800x600x15";
 			$options[0x314] = "800x600x16";
 			$options[0x315] = "800x600x24";
-			$options[0x33B] = "800x600x32";
+			$options[0x33B] = "800x600x32";//322?
+			$options[815]   = "896x672x8";
+			$options[816]   = "896x672x15";
+			$options[817]   = "896x672x16";
+			$options[818]   = "896x672x24";
+			$options[819]   = "896x672x32";
+			$options[874]   = "1024x640x8";
+			$options[875]   = "1024x640x15";
+			$options[876]   = "1024x640x16";
+			$options[877]   = "1024x640x24";
+			$options[878]   = "1024x640x32";
 			//$options[772] = "1024x768x4";
 			$options[0x305] = "1024x768x8";
 			$options[0x316] = "1024x768x15";
 			$options[0x317] = "1024x768x16";
 			$options[0x318] = "1024x768x24";
-			$options[0x33C] = "1024x768x32";
+			$options[0x33C] = "1024x768x32";//323?
+			$options[869]   = "1152x720x8";
+			$options[870]   = "1152x720x15";
+			$options[871] =   "1152x720x16";
+			$options[872] =   "1152x720x24";
+			$options[873] =   "1152x720x32";
 			$options[0x307] = "1280x1024x8";
 			$options[0x319] = "1280x1024x15";
 			$options[0x31A] = "1280x1024x16";
 			$options[0x31B] = "1280x1024x24";
 			$options[0x33D] = "1280x1024x32";
+			$options[835]   = "1400x1050x8";
+			$options[837] =   "1400x1050x16";
+			$options[838] =   "1400x1040x24";
+			$options[864]   = "1440x900x8";
+			$options[864]   = "1440x900x15";
+			$options[866] =   "1440x900x16";
+			$options[867] =   "1440x900x24";
+			$options[868] =   "1440x900x32";
 			$options[0x330] = "1600x1200x8";
 			$options[0x331] = "1600x1200x16";
+			$options[893]   = "1920x1200x8";
 			foreach ($options as $key => $value) {
 				echo '<option value="'.$key.'"';
 				if ($key == $selected || $value == $selected)
@@ -383,12 +439,42 @@
 	<td><select name="size">
 <?php
 	foreach ($sizes as $key => $value) {
+		switch ($key) {
+		case "368640" :
+			echo "		<optgroup label=\"5&frac14; SD\">\n";
+			break;
+		case "737280" :
+			echo "		</optgroup>\n";
+			echo "		<optgroup label=\"3&frac12; SD\">\n";
+			break;
+		case "1228800" :
+			echo "		</optgroup>\n";
+			echo "		<optgroup label=\"5&frac14; HD\">\n";
+			break;
+		case "1474560" :
+			echo "		</optgroup>\n";
+			echo "		<optgroup label=\"3&frac12; HD\">\n";
+			break;
+		case "2949120" :
+			echo "		</optgroup>\n";
+			echo "		<optgroup label=\"3&frac12; ED\">\n";
+			break;
+		case "0" :
+			echo "		</optgroup>\n";
+			break;
+		}
 		echo "		<option value=\"$key\"";
 		if ($key == "1474560") echo " selected='selected'";
 		echo ">$value</option>\n";
 	}
 ?>
 	</select>&nbsp;
+	RAM used&nbsp;<select name="ram">
+<?php
+	for ($i = 16; $i >= 4; $i--)
+		echo "		<option value=\"$i\">$i MB</option>\n";
+?>
+	</select>&nbsp;
 		<input name="build" value="Build floppy set" type="submit" />
 	</td>
 	</tr>
@@ -402,6 +488,9 @@
 <p>
 Note 2: the extra initramfs may be useful to add your own configuration files.
 </p>
+<p>
+Note 3: the keyboard is read for ESC or ENTER on every form feed (ASCII 12) in the boot message.
+</p>
 EOT;
 	}
 	else {
@@ -455,13 +544,13 @@
 <h4>How does it work ?</h4>
 <p>
 This tool updates the boot sector of your kernel with
-<a href="http://hg.slitaz.org/wok/raw-file/b84ff32e3457/linux/stuff/linux-header-2.6.34.u">this patch</a>.
+<a href="http://hg.slitaz.org/wok/raw-file/66e38bd6a132/linux/stuff/linux-header.u">this patch</a>.
 You may add a default cmdline and an initramfs. The cmdline can be edited at boot
-time but the keyboard is not mandatory.
+time but the <acronym title="Check for disk swap every 5 seconds">keyboard is not mandatory</acronym>.
 A <a href="bootloader"> standalone version</a> is available.
 </p>
 <p>
-Each part (boot, setup, cmdline, kernel, initramfs) is aligned to 512 bytes.
+Each part (boot, setup, boot message, cmdline, kernel, initramfs) is aligned to 512 bytes.
 The result is split to fit the floppy size.
 The last floppy image is padded with zeros.
 </p>
@@ -490,13 +579,13 @@
 <!-- Bottom and logo's -->
 <div id="bottom">
 <p>
-<a href="http://validator.w3.org/check?uri=referer"><img src="/static/xhtml10.png" alt="Valid XHTML 1.0" title="Code validé XHTML 1.0" style="width: 80px; height: 15px;" /></a>
+<a href="http://validator.w3.org/check?uri=referer"><img src="../static/xhtml10.png" alt="Valid XHTML 1.0" title="Code validé XHTML 1.0" style="width: 80px; height: 15px;" /></a>
 </p>
 <p>
 	<img src="#" id="qrcodeimg" alt="#" width="60" height="60"
-	     onmouseover= "this.title = location.href"
-	     onclick= "this.width = this.height = 300" />
-	<script type="text/javascript" src="/static/qrcode.js"></script>
+	     onmouseover= "this.title = location.href" 
+	     onclick= "this.width = this.height = 300;" />
+	<script type="text/javascript" src="../static/qrcode.js"></script>
 	<script type="text/javascript">
 		document.getElementById('qrcodeimg').src =
 			QRCode.generatePNG(location.href, {ecclevel: 'H'});
diff -r 28c1b40cf593 -r e6e4be1b2591 mirror/floppies/download.php
--- a/mirror/floppies/download.php	Wed May 01 10:50:21 2013 +0200
+++ b/mirror/floppies/download.php	Thu May 09 18:16:08 2013 +0200
@@ -45,9 +45,13 @@
 	<meta name="description" content="slitaz boot floppies" />
 	<meta name="robots" content="index, nofollow" />
 	<meta name="author" content="SliTaz Contributors" />
-	<link rel="shortcut icon" href="../css/favicon.ico" />
-	<link rel="stylesheet" type="text/css" href="../css/slitaz.css" />
+	<link rel="shortcut icon" href="static/favicon.ico" />
+	<link rel="stylesheet" type="text/css" href="static/slitaz.css" />
 	<style type="text/css">
+table {
+	background-color: inherit;
+	margin: 10px 0px 0px 0px;
+}
 #copy {
 	text-align: center;
 }
@@ -65,11 +69,10 @@
 	<div id="logo"></div>
 	<div id="network">
 		<a href="http://www.slitaz.org/">
-		<img src="/css/pics/network.png" alt="network.png" /></a>
-		<a href="floppy-grub4dos" title="Boot tools">Generic boot floppy</a> |
-		<a href="http://tiny.slitaz.org/" title="SliTaz in one floppy !">Tiny SliTaz</a> |
-		<a href="index-loram.html" title="Floppy image sets for low ram systems">Loram floppies</a> |
-		<a href="builder/index.php" title="Build floppies with your own kernel and initramfs">Floppy set web builder</a> |
+		<img src="static/home.png" alt="[ home ]" /></a>
+		<a href="floppy-grub4dos" title="Boot tools">Generic boot floppy</a>
+		<a href="http://tiny.slitaz.org/" title="SliTaz in one floppy !">Tiny SliTaz</a>
+		<a href="builder/index.php" title="Build floppies with your own kernel and initramfs">Floppy set web builder</a>
 		<a href="builder/bootloader" title="Build your floppy sets without Internet">Shell builder</a>
 	</div>
 	<h1><a href="http://www.slitaz.org/">Boot floppies</a></h1>
@@ -84,19 +87,18 @@
 <?php
 $max = floor((my_filesize("../".$_POST["iso"]) + $fdsz - 1 + $cpiopad) / $fdsz);
 for ($i = 1; $i <= $max ; $i++) {
-	if ($i % 4 == 1) echo "<tr>\n";
-	echo "	<td><a href=\"download.php?file=$i&amp;iso=".
+	if ($i % 6 == 1) echo "<tr>\n";
+	echo "	<td> <a href=\"download.php?file=$i&amp;iso=".
 		urlencode($_POST["iso"])."\">fdiso".sprintf("%02d",$i);
-	if ($max < 100) echo ".img";
-	echo "</a></td>\n";
-	if ($i % 4 == 0) echo "</tr>\n";
+	echo "</a> </td>\n";
+	if ($i % 6 == 0) echo "</tr>\n";
 }
-if ($max % 4 != 0) {
-	while ($max % 4 != 3) { echo "<td></td>"; $max++; }
+if ($max % 6 != 0) {
+	while ($max % 6 != 5) { echo "<td></td>"; $max++; }
 }
 else echo "<tr>\n";
 echo "	<td><a href=\"download.php?file=md5sum&amp;iso=".
-	urlencode($_POST["iso"])."\">md5sum</a></td>\n</tr>";
+	urlencode($_POST["iso"])."\">md5</a></td>\n</tr>";
 ?>
 </table>
 	</div>
@@ -104,12 +106,15 @@
 	<div id="block_info">
 		<h4>Available boot floppies</h4>
 		<ul>
-	<li><a href="index-4.0.html">SliTaz 4.0</a></li>
-	<li><a href="index-loram-4.0.html">SliTaz loram 4.0</a></li>
-	<li><a href="index-3.0.html">SliTaz 3.0</a></li>
-	<li><a href="index-loram-3.0.html">SliTaz loram 3.0</a></li>
-	<li><a href="index-2.0.html">SliTaz 2.0</a></li>
-	<li><a href="index-1.0.html">SliTaz 1.0</a></li>
+<?php
+for ($i = 1; file_exists("index-$i.0.html") ; $i++);
+while (--$i > 0) {
+	echo "	<li><a href=\"index-$i.0.html\">SliTaz $i.0</a>";
+	if (file_exists("index-loram-".$i.".0.html"))
+		echo " - <a href=\"index-loram-$i.0.html\">loram</a>";
+	echo "</li>\n";
+}
+?>
 		</ul>
 	</div>
 </div>
diff -r 28c1b40cf593 -r e6e4be1b2591 mirror/floppies/floppies
--- a/mirror/floppies/floppies	Wed May 01 10:50:21 2013 +0200
+++ b/mirror/floppies/floppies	Thu May 09 18:16:08 2013 +0200
@@ -2,22 +2,26 @@
 
 read32()
 {
-	dd if=kernel bs=1 skip=$((0x$1)) count=4 2> /dev/null | \
-		hexdump -e '"" 1/4 "%d" "\n"'
+	echo $(od -j $((0x$1)) -N 4 -t u4 -An kernel)
+}
+
+ddsect()
+{
+	dd bs=512 count=$@ 2> /dev/null
 }
 
 case "$1" in
 extract)
-	dd bs=512 count=2 > kernel 2> /dev/null
+	ddsect 2 > kernel
 	setupsz=$(($(read32 1F1) & 255))
-	dd bs=512 count=$(($setupsz - 1)) >> kernel 2> /dev/null
+	ddsect $(($setupsz - 1)) >> kernel
 	[ $(read32 228) -ne 0 ] &&
-	dd bs=512 count=1 2> /dev/null | strings > cmdline
+	ddsect 1 | strings > cmdline
 	syssz=$(read32 1F4)
 	syssz=$(( ($syssz + 31) / 32 ))
-	dd bs=512 count=$syssz >> kernel 2> /dev/null
+	ddsect $syssz >> kernel
 	ramsz=$(read32 21C)
-	dd bs=512 count=$((($ramsz + 511) / 512)) of=rootfs 2> /dev/null
+	ddsect $((($ramsz + 511) / 512)) of=rootfs
 	dd bs=1 seek=$ramsz count=0 of=rootfs 2> /dev/null
 	;;
 *)	cat <<EOT
diff -r 28c1b40cf593 -r e6e4be1b2591 mirror/floppies/loram-1.0/description.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mirror/floppies/loram-1.0/description.html	Thu May 09 18:16:08 2013 +0200
@@ -0,0 +1,12 @@
+<p>
+Start your computer with <i>fd001.img</i>. It will show the kernel version string and
+the kernel cmdline line. You can edit the cmdline. Most users can just press Enter.
+</p>
+<p>
+The floppy is then loaded into memory (one dot each 64k) and you will be prompted to
+insert the next floppy, <i>fd002.img</i>.
+</p>
+<p>
+The bootstrap will then start and you will be prompted to insert extra floppies
+from <i>fd100.img</i> to <i>fd121.img</i>.
+</p>
diff -r 28c1b40cf593 -r e6e4be1b2591 mirror/floppies/loram-1.0/title
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mirror/floppies/loram-1.0/title	Thu May 09 18:16:08 2013 +0200
@@ -0,0 +1,1 @@
+Released on 22 March 2008, needs 80Mb RAM
diff -r 28c1b40cf593 -r e6e4be1b2591 mirror/floppies/loram-2.0/description.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mirror/floppies/loram-2.0/description.html	Thu May 09 18:16:08 2013 +0200
@@ -0,0 +1,29 @@
+<p>
+You can start with one of the 3 following flavors :
+</p>
+<ul>
+  <li>
+  <b>base</b> needs 22Mb of RAM and 6 floppies: <i>fd001.img</i> to <i>fd103.img</i>.<br />
+  base provides the minimum slitaz distribution subset in text mode. 
+  </li>
+  <li>
+  <b>justx</b> needs 64M of RAM and 13 floppies: <i>fd001.img</i> to <i>fd206.img</i>.<br />
+  justx provides the minimum slitaz distribution subset with X11 support. 
+  </li>
+  <li>
+  <b>core</b> needs 92M of RAM and 25 floppies: <i>fd001.img</i> to <i>fd311.img</i>.<br />
+  core provides the default slitaz distribution. 
+  </li>
+</ul>
+<p>
+Start your computer with <i>fd001.img</i>. It will show the kernel version string and
+the kernel cmdline line. You can edit the cmdline. Most users can just press Enter.
+</p>
+<p>
+The floppy is then loaded into memory (one dot each 64k) and you will be prompted to
+insert the next floppy, <i>fd002.img</i>.
+</p>
+<p>
+The loram bootstrap will then start and you will be prompted to insert extra floppies
+for base, justx and core flavors. You can bypass this by using Q and Enter.
+</p>
diff -r 28c1b40cf593 -r e6e4be1b2591 mirror/floppies/loram-2.0/title
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mirror/floppies/loram-2.0/title	Thu May 09 18:16:08 2013 +0200
@@ -0,0 +1,1 @@
+Released on 16 April 2009, needs 80Mb RAM
diff -r 28c1b40cf593 -r e6e4be1b2591 mirror/floppies/loram-3.0/title
--- a/mirror/floppies/loram-3.0/title	Wed May 01 10:50:21 2013 +0200
+++ b/mirror/floppies/loram-3.0/title	Thu May 09 18:16:08 2013 +0200
@@ -1,1 +1,1 @@
-Released on 28 March 2010, needs 80b RAM
+Released on 28 March 2010, needs 80Mb RAM
diff -r 28c1b40cf593 -r e6e4be1b2591 mirror/floppies/loram-4.0/description.html
--- a/mirror/floppies/loram-4.0/description.html	Wed May 01 10:50:21 2013 +0200
+++ b/mirror/floppies/loram-4.0/description.html	Thu May 09 18:16:08 2013 +0200
@@ -11,7 +11,7 @@
   justx provides the minimum slitaz distribution subset with X11 support. 
   </li>
   <li>
-  <b>gtkonly</b> needs 111M of RAM and 19 floppies: <i>fd001.img</i> to <i>fd304.img</i>.<br />
+  <b>gtkonly</b> needs 111M of RAM and 18 floppies: <i>fd001.img</i> to <i>fd304.img</i>.<br />
   gtkonly provides the minimum slitaz distribution subset with Gtk+ support. 
   </li>
   <li>
diff -r 28c1b40cf593 -r e6e4be1b2591 mirror/floppies/mkindex.sh
--- a/mirror/floppies/mkindex.sh	Wed May 01 10:50:21 2013 +0200
+++ b/mirror/floppies/mkindex.sh	Thu May 09 18:16:08 2013 +0200
@@ -84,24 +84,24 @@
 <!-- Block -->
 <div id="block">
 	<!-- Navigation -->
-	<div id="block_nav">
+	<div id="block_nav" style="height: 126px;">
 		<h4><img src="pics/floppy.png" alt="@" />1.44Mb SliTaz$LORAM $VERSION floppy images</h4>
 <table width="100%">
 $(
 n=0
 for f in $DIR/fd*img ; do
 	[ $n -eq 0 ] && echo "<tr>"
-	echo "	<td> <a href=\"$f\">$(basename $f)</a> </td>"
-	n=$(( ($n+1)&3 ))
+	echo "	<td> <a href=\"$f\">$(basename $f .img)</a> </td>"
+	n=$(( ($n+1)%6 ))
 	[ $n -eq 0 ] && echo "</tr>"
 done
 [ $n -eq 0 ] && echo "<tr>"
-while [ $n -ne 3 ]; do
+while [ $n -ne 5 ]; do
 	echo "	<td> </td>"
 	n=$(($n+1))
 done
 )
-	<td> <a href="$DIR/md5sum">md5sum</a> </td>
+	<td> <a href="$DIR/md5sum">md5</a> </td>
 </tr>
 </table>
 	</div>
@@ -113,7 +113,7 @@
 tail=""
 list_version | while read dir; do
 	case "$dir" in
-	loram*)	echo -en "\n	<a href=\"index-$dir.html\">loram</a>" ;;
+	loram*)	echo -en "\n	- <a href=\"index-$dir.html\">loram</a>" ;;
 	*) 	echo -en "$tail	<li><a href=\"index-$dir.html\">SliTaz $dir</a>" ;;
 	esac
 	tail="</li>\n"
@@ -216,16 +216,6 @@
 Copyright &copy; <span class="year"></span> <a href="http://www.slitaz.org/">SliTaz</a> -
 <a href="http://www.gnu.org/licenses/gpl.html">GNU General Public License</a>
 </p>
-<p>
-	<img src="#" id="qrcodeimg" alt="#" width="60" height="60"
-	     onmouseover= "this.title = location.href"
-	     onclick= "this.width = this.height = 300" />
-	<script type="text/javascript" src="static/qrcode.js"></script>
-	<script type="text/javascript">
-		document.getElementById('qrcodeimg').src =
-			QRCode.generatePNG(location.href, {ecclevel: 'H'});
-	</script>
-</p>
 <!-- End of copy -->
 </div>
 
@@ -234,6 +224,16 @@
 <p>
 <a href="http://validator.w3.org/check?uri=referer"><img src="static/xhtml10.png" alt="Valid XHTML 1.0" title="Code validé XHTML 1.0" style="width: 80px; height: 15px;" /></a>
 </p>
+<p>
+	<img src="#" id="qrcodeimg" alt="#" width="60" height="60"
+	     onmouseover= "this.title = location.href" 
+	     onclick= "this.width = this.height = 300;" />
+	<script type="text/javascript" src="static/qrcode.js"></script>
+	<script type="text/javascript">
+		document.getElementById('qrcodeimg').src =
+			QRCode.generatePNG(location.href, {ecclevel: 'H'});
+	</script>
+</p>
 </div>
 
 </body>