Set subdirectories of $OUTPUT independent of cmdline parsing

diff --git a/debian/changelog b/debian/changelog
index 1b0eb15..2ce324b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,8 +31,10 @@ grml-live (0.9.20) UNRELEASED; urgency=low
     on fresh installations).
   * Document usage of STOP_ON_ERROR in /etc/grml/fai/fai.conf.
   * Really add support for genisoimage (thanks for the bugreport, Worf).
+  * Set subdirectories of $OUTPUT independent of cmdline parsing so
+    it is possible to set it via conffile as well.
 
- -- Michael Prokop <mika@grml.org>  Mon, 03 Aug 2009 23:06:59 +0200
+ -- Michael Prokop <mika@grml.org>  Tue, 04 Aug 2009 13:16:10 +0200
 
 grml-live (0.9.19) unstable; urgency=low
 

diff --git a/grml-live b/grml-live
index 4059843..29d19f9 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -230,11 +230,7 @@ while getopts "a:C:c:g:i:o:r:s:t:v:bBFuqVz" opt; do
     C) CONFIG="$OPTARG" ;;
     g) GRML_NAME="$OPTARG" ;;
     i) ISO_NAME="$OPTARG" ;;
-    o) OUTPUT="$OPTARG"
-       CHROOT_OUTPUT="$OUTPUT/grml_chroot"
-       BUILD_OUTPUT="$OUTPUT/grml_cd"
-       ISO_OUTPUT="$OUTPUT/grml_isos"
-       ;;
+    o) OUTPUT="$OPTARG" ;;
     q) SKIP_MKSQUASHFS=1 ;;
     r) RELEASENAME="$OPTARG" ;;
     s) SUITE="$OPTARG" ;;
@@ -256,6 +252,11 @@ specify it on the command line using the -c option."
 [ -n "$OUTPUT" ] || bailout 1 "Error: \$OUTPUT unset, please set it in $LIVE_CONF or
 specify it on the command line using the -o option."
 
+# set subdirectories according to $OUTPUT:
+CHROOT_OUTPUT="$OUTPUT/grml_chroot"
+BUILD_OUTPUT="$OUTPUT/grml_cd"
+ISO_OUTPUT="$OUTPUT/grml_isos"
+
 # trim characters that are known to cause problems inside $GRML_NAME;
 # for example isolinux does not like '-' inside the directory name
 [ -n "$GRML_NAME" ] && export SHORT_GRML_NAME="$(echo $GRML_NAME | tr -d ',./;\- ')"