SliTaz Repositories

     1.1 --- a/mirror-tools/stuff/usr/bin/mkpkgiso	Mon Mar 29 13:03:09 2010 +0000
     1.2 +++ b/mirror-tools/stuff/usr/bin/mkpkgiso	Mon Mar 29 21:57:31 2010 +0200
     1.3 @@ -274,7 +274,10 @@
     1.4  # Gen boot part
     1.5  BOOT_OPT=""
     1.6  iso=$ISO_DIR/slitaz-$PKG_VER.iso
     1.7 -isoloram=$ISO_DIR/flavors/slitaz-loram-cdrom-sqfs.iso
     1.8 +for i in slitaz-loram-cdrom-sqfs slitaz-$PKG_VER-loram-cdrom ; do
     1.9 +	isoloram=$ISO_DIR/flavors/$i.iso
    1.10 +	[ -s $isoloram ] && break
    1.11 +done
    1.12  case " $OPTIONS " in
    1.13  *\ --boot\ *)
    1.14  	echo -n "Creating boot tree"
    1.15 @@ -308,8 +311,16 @@
    1.16  		need $IFMEM_C32 $isoloram
    1.17  		which isoinfo > /dev/null || need /usr/bin/isoinfo
    1.18  		cp $IFMEM_C32 "$TEMP_DIR/boot/isolinux"
    1.19 -		isoinfo -R -x "/usr.sqfs" -i $isoloram > "$TEMP_DIR/usr.sqfs"
    1.20 -		echo "$SORT_DIR/usr.sqfs -5000" >> $SORT_FILE
    1.21 +		isoinfo -R -x "/usr.sqfs" -i $isoloram \
    1.22 +			> "$TEMP_DIR/usr.sqfs" 2> /dev/null
    1.23 +		if [ -s "$TEMP_DIR/usr.sqfs" ]; then
    1.24 +			echo "$SORT_DIR/usr.sqfs -5000" >> $SORT_FILE
    1.25 +		else
    1.26 +			rm -f "$TEMP_DIR/usr.sqfs"
    1.27 +			isoinfo -R -x "/rootfs.gz" -i $isoloram \
    1.28 +				> "$TEMP_DIR/rootfs.gz" 2> /dev/null
    1.29 +			echo "$SORT_DIR/rootfs.gz -5000" >> $SORT_FILE
    1.30 +		fi
    1.31  		isoinfo -R -x "/boot/rootfs.gz" -i $isoloram > \
    1.32  			"$TEMP_DIR/boot/loram.gz"
    1.33  		cat >> $TEMP_DIR/boot/isolinux/common.cfg <<EOT