[Devil-linux-commit] build/scripts build-iso,1.45,1.46

[<smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv7310/scripts

Modified Files:
	build-iso 
Log Message:
added zisofstools and enabled use of compressed ISO


Index: build-iso
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/build-iso,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- build-iso	31 Oct 2003 20:58:07 -0000	1.45
+++ build-iso	7 Nov 2003 22:57:58 -0000	1.46
@@ -46,6 +46,8 @@
 		# is in the initrdtree directory. Put everything in there what you think
 		# will be needed. We assume that this is the case.
 
+		MKISOFS_PARAM=""
+
 		rm -rf $WORKDIR/mnt
 		mkdir -p $WORKDIR/mnt/loop{1,2}
 
@@ -70,9 +72,22 @@
 
 		#===========================================================================
 
-		#echo -n "compressing modules..."
+		if [ "$CONFIG_ZISOFS" = "y" ]; then
+			echo creating compressed ISO filesystem
+			test -d $CDDIR.z && rm -rf $CDDIR.z
+			mkzftree $CDDIR $CDDIR.z || exit 1
+			MKISOFS_PARAM="$MKISOFS_PARAM -z"
+
+			# now we need to restore the files which shouldn't be compressed
+			cp -fdp $CDDIR/* $CDDIR.z/
+			cp -fdpR $CDDIR/boot $CDDIR.z/ || exit 1
+			cp -fdpR $CDDIR/doc $CDDIR.z/ || exit 1
+			CDDIR="$CDDIR.z"
+		fi
+
+		#===========================================================================
+
 		echo -n "copying modules...."
-		#(cd $WORKDIR/modules.initrd; tar -cjf $INITRDDIR/modules.tar.bz2 *)
 		cp -fdpR $WORKDIR/modules.initrd/* $INITRDDIR/ || exit 1
 		echo $DL_VERSION > $INITRDDIR/VERSION
 
@@ -104,8 +119,6 @@
 		echo "creating the initial ramdisk (initrd) image.... "
 
 		cp -p $DL_DIR/config/etc/initrd/linuxrc $INITRDDIR
-#		cp -p $DL_DIR/config/etc/initrd/links $INITRDDIR
-#		cp -p $ETCDIR/etc/init.d/functions $INITRDDIR
 		mkcramfs $INITRDDIR/ $BOOTIMAGEDIR/initrd
 		gzip -f -9 $BOOTIMAGEDIR/initrd
 
@@ -161,10 +174,7 @@
 
 		# copy Kernel to CD Tree, to provide support for LOADLIN
 		cp $BOOTIMAGEDIR/vmlinuz $CDDIR/boot/
-		#cp $BOOTIMAGEDIR/initrd $CDDIR/boot/
 		cp $BOOTIMAGEDIR/initrd.gz $CDDIR/boot/
-		#cp $BOOTIMAGEDIR/vmlinuz $CDDIR
-		#cp $BOOTIMAGEDIR/initrd.gz $CDDIR
 
 		# store version info
 		echo $DL_VERSION > $CDDIR/DEVIL-LINUX
@@ -176,7 +186,7 @@
 		mkisofs -b boot/isolinux.bin -c boot/boot.cat \
 		-no-emul-boot -boot-load-size 4 -boot-info-table \
 		-o $WORKDIR/bootcd.iso \
-		-J -l -L  -R  \
+		-J -l -L  -R $MKISOFS_PARAM  \
 		-p "he...@de..." \
 		-P "Devil Linux Developer Team" \
 		-A "Devil-Linux v$DL_VERSION" \