From 527f138146e816366b483d1cb67d3f779b603fd1 Mon Sep 17 00:00:00 2001
From: lars <lars@systemausfall.org>
Date: Tue, 4 Oct 2005 12:15:20 +0000
Subject: [PATCH] "release" action now defaults to "dfsbuild config harden
 isoz" (instead of "iso") "burn" action now refers to the compressed image

---
 scripts/cbox-build.sh | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/scripts/cbox-build.sh b/scripts/cbox-build.sh
index 1e4d13d..4e9d35e 100755
--- a/scripts/cbox-build.sh
+++ b/scripts/cbox-build.sh
@@ -11,7 +11,7 @@
 #   burn	- burns the image on a cd-rw
 #
 # final action:
-#   release	- the same as "dfsbuild config harden iso"
+#   release	- the same as "dfsbuild config harden isoz"
 #
 #
 # problems of this script:
@@ -19,7 +19,7 @@
 #  - 'harden' is strangely integrated
 #
 # you may run this script with multiple arguments, e.g.:
-#   cb-build.sh dfsbuild config iso
+#   cb-build.sh dfsbuild config isoz
 #
 # the action "release" does what it says :)
 #  (all developer's features like sshd, writable templates and
@@ -50,7 +50,7 @@ function run_dfsbuild()
 }
 
 
-function create_iso()
+function create_uncompressed_iso()
 {
 	echo "Creating the iso ..."
 	mkisofs $MKISOFS_OPTIONS -o "$IMAGE_FILE" "$IMAGE_DIR"
@@ -125,7 +125,7 @@ function fetch_revision()
 function blanknburn_cdrw()
 {
 	cdrecord -v dev=$CDWRITER blank=fast
-	cdrecord -v dev=$CDWRITER $IMAGE_FILE
+	cdrecord -v dev=$CDWRITER $IMAGEZ_FILE
 }
 ################ do it! ######################
 
@@ -140,42 +140,42 @@ for a in $LOCALCONF_DIR $CUSTOM_CONFIGURE_DIR
 [ "$(id -u)" -ne 0 ] && echo "this script ($0) has to be called as root" >&2 && exit 1
 
 while [ $# -gt 0 ]
-   do	case "$1" in
-	    dfsbuild )
+  do	case "$1" in
+	dfsbuild )
 		# check if we are in ROOT_DIR - otherwise we will have problems with
 		# relative paths in dfs-box.conf
 		[ "$ROOT_DIR" -ef "$(pwd)" ] || error_die 1 "Sorry: you have to run $0 while you are in '$ROOT_DIR'!"
 		run_dfsbuild
 		;;
-	    config )
+	config )
 		configure_cb normal
 		;;
-	    iso )
-		create_iso
+	iso )
+		create_uncompressed_iso
 		;;
-	    isoz )
+	isoz )
 		create_compressed_iso
 		;;
-	    harden )
+	harden )
 		chroot "$IMAGE_DIR" "$CHROOT_START" /usr/lib/cryptobox/configure-cryptobox.sh secure
-	    	;;
-	    burn )
+		;;
+	burn )
 		blanknburn_cdrw
 		;;
-	    release )
-	    	$0 dfsbuild config harden iso
+	release )
+		$0 dfsbuild config harden isoz
 		;;
-	    help|--help )
+	help|--help )
 		echo "Syntax: `basename $0` ( release | dfsbuild | config | harden | iso | isoz | burn | help )"
 		echo "  (you may specify more than one action)"
 		echo
-	    	;;
-	    * )
+		;;
+	* )
 		echo -e "unknown action: $1"
 		echo
 		$0 help
 		exit 1
 		;;
-	  esac
-	  shift
+	esac
+	shift
   done