From: Michael Prokop <mika@grml.org>
Date: Tue, 18 May 2010 11:45:54 +0000 (+0200)
Subject: Source specified configuration file at according stage.
X-Git-Tag: v0.38~2
X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=commitdiff_plain;h=4fae346b2e816b3d7f97ea9e42455f104db5adb6

Source specified configuration file at according stage.
---

diff --git a/grml-debootstrap b/grml-debootstrap
index 8243192..653f16c 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -93,16 +93,9 @@ check4progs debootstrap dialog || exit 1
 check4root || exit 1
 # }}}
 
-# source configuration file {{{
+# source main configuration file {{{
 if [ -r /etc/debootstrap/config ] ; then
-   if [ -n "$CONFIGFILE" ] ; then
-      einfo "Using config file $CONFIGFILE."
-      if ! . "$CONFIGFILE" ; then
-         eerror "Error reading config file $CONFIGFILE" ; eend 1 ; exit 1
-      fi
-   else
-      . /etc/debootstrap/config
-   fi
+  . /etc/debootstrap/config
 fi
 # }}}
 
@@ -172,6 +165,15 @@ fi
 }
 # }}}
 
+# source specified configuration file {{{
+if [ -n "$CONFIGFILE" ] ; then
+   einfo "Reading specified config file $CONFIGFILE."
+   if ! . "$CONFIGFILE" ; then
+      eerror "Error reading config file $CONFIGFILE" ; eend 1 ; exit 1
+   fi
+fi
+# }}}
+
 # backwards compability checks {{{
 if [ -n "$GROOT" ] ; then
    echo "Error: you seem to have \$GROOT configured." >&2