From: Michael Prokop <mika@grml.org>
Date: Tue, 22 Jan 2008 10:58:17 +0000 (+0100)
Subject: Merge branches
X-Git-Tag: 0.2~4^2
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=079ea71204d408f78886da20fe019dd631a3b2bc;hp=8f6ab7afaa3c1f544485be8a667b4bdb50d4e67b

Merge branches
---

diff --git a/debian/changelog b/debian/changelog
index 4b6b44b..04f235f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ grml-live (0.1) unstable; urgency=low
 
   * Bump version number to 0.1 as we ship grml-live with the
     upcoming stable versions.
+  * Source /etc/grml/grml-live.local before parsing command line
+    options to be able to override configuration on the commandline.
   * Use /usr/bin/vim.tiny as alternativ for vi.
   * Add new packages to GRML_FULL:
     - at76-usb-modules-2.6.23-grml64
diff --git a/grml-live b/grml-live
index 534b809..e35dcbf 100755
--- a/grml-live
+++ b/grml-live
@@ -4,10 +4,10 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
-# Latest change: Sun Jan 20 22:38:18 CET 2008 [mika]
+# Latest change: Die Jän 22 11:57:54 CET 2008 [mika]
 ################################################################################
 
-# main initialization  setup, set some misc variables {{{
+# read configuration files, set some misc variables {{{
 
 export LANG=C
 export LC_ALL=C
@@ -186,27 +186,9 @@ else
    log "No $LOCAL_CONFIG found, not sourcing it"
    LOCAL_CONFIG=''
 fi
-
-# clean/zero grml-live logfile:
-if [ -n "$ZERO_LOGFILE" ] ; then
-   echo -n > $LOGFILE
-fi
-
-# clean/zero/remove old FAI directory:
-if [ -n "$ZERO_FAI_LOGFILE" ] ; then
-   if [ -d /var/log/fai/"$HOSTNAME" ] ; then
-      rm -rf /var/log/fai/"$HOSTNAME"/"$(readlink /var/log/fai/"$HOSTNAME"/last)"
-      rm -rf /var/log/fai/"$HOSTNAME"/"$(readlink /var/log/fai/"$HOSTNAME"/last-dirinstall)"
-      rm -rf /var/log/fai/"$HOSTNAME"/"$(readlink /var/log/fai/"$HOSTNAME"/last-softupdate)"
-      rm -f /var/log/fai/"$HOSTNAME"/last \
-            /var/log/fai/"$HOSTNAME"/last-dirinstall \
-            /var/log/fai/"$HOSTNAME"/last-softupdate
-   fi
-fi
 # }}}
 
 # command line parsing {{{
-
 while getopts "a:C:c:g:i:o:r:s:t:v:bFhuVz" opt; do
   case "$opt" in
     a) ARCH="$OPTARG" ;;
@@ -242,6 +224,25 @@ specify it on the command line using the -c option."
 specify it on the command line using the -o option."
 # }}}
 
+# clean/zero grml-live logfile {{{
+if [ -n "$ZERO_LOGFILE" ] ; then
+   echo -n > $LOGFILE
+fi
+# }}}
+
+# clean/zero/remove old FAI directory {{{
+if [ -n "$ZERO_FAI_LOGFILE" ] ; then
+   if [ -d /var/log/fai/"$HOSTNAME" ] ; then
+      rm -rf /var/log/fai/"$HOSTNAME"/"$(readlink /var/log/fai/"$HOSTNAME"/last)"
+      rm -rf /var/log/fai/"$HOSTNAME"/"$(readlink /var/log/fai/"$HOSTNAME"/last-dirinstall)"
+      rm -rf /var/log/fai/"$HOSTNAME"/"$(readlink /var/log/fai/"$HOSTNAME"/last-softupdate)"
+      rm -f /var/log/fai/"$HOSTNAME"/last \
+            /var/log/fai/"$HOSTNAME"/last-dirinstall \
+            /var/log/fai/"$HOSTNAME"/last-softupdate
+   fi
+fi
+# }}}
+
 # ask user whether the setup is ok {{{
 if [ -z "$FORCE" ] ; then
    echo