[Devil-linux-commit] build/scripts build-iso,1.65.2.2,1.65.2.3

[Friedrich L. <fr...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv24632/build/scripts

Modified Files:
      Tag: rel-1-2-patches
	build-iso 
Log Message:
whitespacing fixed


Index: build-iso
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/build-iso,v
retrieving revision 1.65.2.2
retrieving revision 1.65.2.3
diff -u -d -r1.65.2.2 -r1.65.2.3
--- build-iso	4 May 2006 12:18:21 -0000	1.65.2.2
+++ build-iso	25 May 2006 18:35:40 -0000	1.65.2.3
@@ -70,7 +70,7 @@
 		else
 			$FAILURE
 			echo "$CDDIR/config/var.tar.bz2 found -> NOT UPDATING IT"
-			echo "do a 'make clean' in  order to get it updated"
+			echo "do a 'make clean' in order to get it updated"
 			$NORMAL
 		fi
 
@@ -145,7 +145,7 @@
 			echo "creating the initial ramdisk (initrd) image.... "
 
 			# first find out how much space we need.
-			ISIZE=`du -s -k  $INITRDDIR | awk '{print $1}'`
+			ISIZE=`du -s -k $INITRDDIR | awk '{print $1}'`
 
 			# is that true? Anyway, we are smaller than that.
 			#if [ $ISIZE -gt 8192 ]; then
@@ -168,7 +168,7 @@
 
 			# make an ext2 filesystem on it. We set the amount of unused space to 0%
 			# and turn down the number of inodes to save space
-			yes | mkfs  -t ext2 -m 0 -i 1024 $WORKDIR/ramdisk
+			yes | mkfs -t ext2 -m 0 -i 1024 $WORKDIR/ramdisk
 			tune2fs -c 0 -i 0 /dev/loop2
 
 			# we mount it...
@@ -211,10 +211,10 @@
 			gzip -c $WORKDIR/ramdisk > $BOOTIMAGEDIR/initrd.gz
 
 			# we are done with the uncompressed ramdisk image, delete it
-			rm  $WORKDIR/ramdisk
+			rm $WORKDIR/ramdisk
 
 			# how much is the contents of the bootimagetree?
-			#ISIZE=`du -s -k  $BOOTIMAGEDIR | awk '{print $1}'`
+			#ISIZE=`du -s -k $BOOTIMAGEDIR | awk '{print $1}'`
 			#echo "Boot image size is $ISIZE KB"
 
 			echo "done"
@@ -255,8 +255,8 @@
 		do
 			echo -n -e "  ${BOOT_OPTIONS_TEXT[$i]}" >> $CDDIR/boot/message
 			if [ ${BOOT_OPTIONS_MODE[$i]} = $CONFIG_BOOT_OPTION_VGA ]; then
-			    BOOT_OPTION_DEFAULT=$i;
-			    echo -n -e " (default)" >> $CDDIR/boot/message
+				BOOT_OPTION_DEFAULT=$i;
+				echo -n -e " (default)" >> $CDDIR/boot/message
 			fi
 			echo -n -e "\r\n" >> $CDDIR/boot/message
 			let "i=$i+1"
@@ -269,15 +269,15 @@
 
 		BOOT_OPTION_RAMDISK="";
 		if [ "$CONFIG_INITRD_FS" = "CRAMFS" ]; then
-		    BOOT_OPTION_RAMDISK="ramdisk_blocksize=4096"
+			BOOT_OPTION_RAMDISK="ramdisk_blocksize=4096"
 		fi
 		if [ "$CONFIG_INITRD_FS" = "EXT2" ]; then
-		    BOOT_OPTION_RAMDISK="ro ramdisk_size=$ISIZE"
+			BOOT_OPTION_RAMDISK="ro ramdisk_size=$ISIZE"
 		fi
 
 		#original: DEFAULT /boot/vmlinuz root=/dev/ram1 initrd=/boot/initrd.gz [ro ramdisk=$ISIZE][ramdisk_blocksize=4096]
 		BOOT_OPTIONS_DL="root=/dev/ram0 initrd=/boot/initrd.gz init=/linuxrc $BOOT_OPTION_RAMDISK"
-		cat  > $CDDIR/isolinux.cfg  <<-EOF
+		cat > $CDDIR/isolinux.cfg <<-EOF
 		default $BOOT_OPTION_DEFAULT
 		display /boot/message
 		timeout 50
@@ -286,7 +286,7 @@
 		i=0
 		while [ $i -lt ${#BOOT_OPTIONS_KERNEL_MODE[@]} ]
 		do
-			cat  >> $CDDIR/isolinux.cfg  <<-EOF
+			cat >> $CDDIR/isolinux.cfg <<-EOF
 			label $i
 			kernel /boot/vmlinuz
 			append $BOOT_OPTIONS_DL vga=${BOOT_OPTIONS_KERNEL_MODE[$i]}
@@ -298,8 +298,8 @@
 		unset BOOT_OPTIONS_KERNEL_MODE
 
 		if [ -f $CDDIR/boot/memtest ]; then
-		    echo "label m" >> $CDDIR/isolinux.cfg
-		    echo "  kernel /boot/memtest" >> $CDDIR/isolinux.cfg
+			echo "label m" >> $CDDIR/isolinux.cfg
+			echo "  kernel /boot/memtest" >> $CDDIR/isolinux.cfg
 		fi
 		echo "F1 /boot/f1.txt" >> $CDDIR/isolinux.cfg
 		echo "F2 /boot/f2.txt" >> $CDDIR/isolinux.cfg
@@ -355,7 +355,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 $MKISOFS_PARAM  \
+		-J -l -L -R $MKISOFS_PARAM \
 		-p "he...@de..." \
 		-P "Devil Linux Developer Team" \
 		-A "Devil-Linux v$DL_VERSION" \