# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1269892651 -7200
# Node ID afd44e3eda0d82c12b28fa7807609aebbc310ee3
# Parent  21caf6b55e3a4702feb6c1b2a87d69cff4b1dc62
mirror-tools/mkpkgiso: add 3.0 loram support

diff -r 21caf6b55e3a -r afd44e3eda0d mirror-tools/stuff/usr/bin/mkpkgiso
--- a/mirror-tools/stuff/usr/bin/mkpkgiso	Mon Mar 29 13:03:09 2010 +0000
+++ b/mirror-tools/stuff/usr/bin/mkpkgiso	Mon Mar 29 21:57:31 2010 +0200
@@ -274,7 +274,10 @@
 # Gen boot part
 BOOT_OPT=""
 iso=$ISO_DIR/slitaz-$PKG_VER.iso
-isoloram=$ISO_DIR/flavors/slitaz-loram-cdrom-sqfs.iso
+for i in slitaz-loram-cdrom-sqfs slitaz-$PKG_VER-loram-cdrom ; do
+	isoloram=$ISO_DIR/flavors/$i.iso
+	[ -s $isoloram ] && break
+done
 case " $OPTIONS " in
 *\ --boot\ *)
 	echo -n "Creating boot tree"
@@ -308,8 +311,16 @@
 		need $IFMEM_C32 $isoloram
 		which isoinfo > /dev/null || need /usr/bin/isoinfo
 		cp $IFMEM_C32 "$TEMP_DIR/boot/isolinux"
-		isoinfo -R -x "/usr.sqfs" -i $isoloram > "$TEMP_DIR/usr.sqfs"
-		echo "$SORT_DIR/usr.sqfs -5000" >> $SORT_FILE
+		isoinfo -R -x "/usr.sqfs" -i $isoloram \
+			> "$TEMP_DIR/usr.sqfs" 2> /dev/null
+		if [ -s "$TEMP_DIR/usr.sqfs" ]; then
+			echo "$SORT_DIR/usr.sqfs -5000" >> $SORT_FILE
+		else
+			rm -f "$TEMP_DIR/usr.sqfs"
+			isoinfo -R -x "/rootfs.gz" -i $isoloram \
+				> "$TEMP_DIR/rootfs.gz" 2> /dev/null
+			echo "$SORT_DIR/rootfs.gz -5000" >> $SORT_FILE
+		fi
 		isoinfo -R -x "/boot/rootfs.gz" -i $isoloram > \
 			"$TEMP_DIR/boot/loram.gz"
 		cat >> $TEMP_DIR/boot/isolinux/common.cfg <<EOT