[Devil-linux-commit] build/scripts build-iso,1.83,1.84

[Serge L. <sma...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32543

Modified Files:
	build-iso 
Log Message:

- don't mix zisofs and squashfs...


Index: build-iso
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/build-iso,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- build-iso	14 Jan 2009 19:03:09 -0000	1.83
+++ build-iso	23 Jan 2009 01:44:24 -0000	1.84
@@ -417,8 +417,14 @@
 		-iso-level 2 \
 		-quiet .
 
-		if [ "$CONFIG_SQUASHFS" = "y" ]; then		
-			mksquashfs $CDDIR $WORKDIR/bootcd.squash
+		if [ "$CONFIG_SQUASHFS" = "y" ]; then
+			if [ "$CONFIG_ZISOFS" = "y" ]; then
+				rm -rf $CDDIR.squash 2>/dev/null
+				mkzftree -u -p $CONFIG_PMAKE $CDDIR $CDDIR.squash		
+				CDDIR="$CDDIR.squash"
+			fi
+			rm -f $WORKDIR/bootcd.squash 2>/dev/null
+			mksquashfs $CDDIR $WORKDIR/bootcd.squash -b 1M -no-exports -no-recovery
 		fi
 
 		popd > /dev/null