# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1695748266 0
# Node ID db2cc84a89170fc7fda0e5fe088817212b891631
# Parent  49e3141e5899d194fe6803c08e4889eb22f23e8a
helper: don't build slitaz.iso twice

diff -r 49e3141e5899 -r db2cc84a8917 README.md
--- a/README.md	Sun Sep 24 17:55:26 2023 +0000
+++ b/README.md	Tue Sep 26 17:11:06 2023 +0000
@@ -8,7 +8,7 @@
 Useful software, expansible, easy to configure, runs fully in RAM, simple, light
 and fast for minimum hardware resources, i.e. fits on one floppy disk (IDE disk
 optional), runs on a 386SX processor and needs as little memory as possible
-(currently 4MB with a 2.6.14 Kernel).
+(currently 4MB with a 2.6.20 Kernel).
 [Example](http://doc.slitaz.org/en:guides:pxe#why-use-pxe-the-vnc-example)
 
 
@@ -20,8 +20,7 @@
 
 ## How is it built?
 
-Tiny SliTaz uses a Linux Kernel and a root ram filesystem. An extra initramfs
-can also be loaded with the configuration files and extra packages.
+Tiny SliTaz uses a Linux Kernel and a initramfs.
 
 The initramfs is based on [uClibc](http://uclibc.org/) (instead of glibc) and
 busybox with its config files and filesystem tree from `base-tiny` package you
diff -r 49e3141e5899 -r db2cc84a8917 helper
--- a/helper	Sun Sep 24 17:55:26 2023 +0000
+++ b/helper	Tue Sep 26 17:11:06 2023 +0000
@@ -494,6 +494,7 @@
 	find . | grep -v ^./boot | cpio -o -H newc | compressto ../rootfs.gz rootfs
 fi
 if [ "x$1" = "x--mkiso" ]; then
+	[ -s $tmp/slitaz.iso ] && exit 0
 	tmp=$2
 	mkdir -p $tmp/iso/boot/isolinux $tmp/iso/data
 	compressto $tmp/iso/data/sysmap.gz < $tmp/fs/boot/System.map
@@ -534,14 +535,15 @@
 prompt 1	
 timeout 50
 EOT
-	genisoimage -o $tmp/slitaz.iso -b boot/isolinux/isolinux.bin \
+	genisoimage -o $tmp/slitaz.iso$$ -b boot/isolinux/isolinux.bin \
                 -c boot/isolinux/boot.cat -no-emul-boot -boot-load-size 4 \
                 -V "Tiny SliTaz" -p "www.slitaz.org" -input-charset iso8859-1 \
                 -boot-info-table $tmp/iso > /dev/null 2>&1
         [ -x /usr/bin/isohybrid ] &&
-        /usr/bin/isohybrid $tmp/slitaz.iso 2> /dev/null
+        /usr/bin/isohybrid $tmp/slitaz.iso$$ 2> /dev/null
         [ -x /usr/bin/iso2exe ] &&
-        /usr/bin/iso2exe $tmp/slitaz.iso 2> /dev/null
+        /usr/bin/iso2exe $tmp/slitaz.iso$$ 2> /dev/null
+	mv $tmp/slitaz.iso$$ $tmp/slitaz.iso
 fi
 if [ "x$1" = "x--mkexe" ]; then
 	tmp=$2
@@ -556,7 +558,7 @@
 		cp fs/boot/bzImage slitaz.img
 		sh fs/boot/bundle slitaz.img rootfs.gz
 		if [ -s fs/boot/bootmenu ]; then
-			echo -n "sh fs/boot/bundle out '   SliTaz boot menu'"
+			echo -n "sh fs/boot/bundle out '  Boot menu'"
 			echo -n " slitaz.img 'Tiny SliTaz'"
 			while read bin button text; do
 				echo -n " fs/boot/$bin '${text% (*}'"
diff -r 49e3141e5899 -r db2cc84a8917 step5.php
--- a/step5.php	Sun Sep 24 17:55:26 2023 +0000
+++ b/step5.php	Tue Sep 26 17:11:06 2023 +0000
@@ -31,10 +31,10 @@
       $use_optgroup=0;
       foreach(array("360K 5¼-inch" => "", "368640" => "360K", "409600" => "400K",
 		    "720K 3½-inch" => "", "737280" => "720K", "819200" => "800K",
-      		    "1.2M 5¼-inch" => "", "1228800" => "1.2M",
+      		    "1.2M 5¼-inch" => "", "1228800" => "1.2M", "1474560" => "1.44M",
       		    "1.44M 3½-inch" => "", "1474560" => "1.44M", "1720320" => "1.68M",
 		    "1966080" => "1.92M", 
-		    "2.88M 3½-inch" => "", "2949120" => "2.88M", "5898240" => "3.36M") as $sz => $nm) {
+		    "2.88M 3½-inch" => "", "2949120" => "2.88M", "3440640" => "3.36M") as $sz => $nm) {
 	if ($nm == "") {
 	  if ($use_optgroup != 0) echo "		</optgroup>\n";
 	  echo "		<optgroup label=\"$sz\">\n";