From 76319632a1c66eb2dbc7305e855b0518ac0a4879 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Tue, 10 Jun 2008 19:04:23 +0200
Subject: Correcting order where system-wide lh_config defaults file is read,
thanks to Juergen Fiedler <juergen.fiedler@gmail.com>.
---
helpers/lh_config | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/helpers/lh_config b/helpers/lh_config
index b06b9eb..d073b6b 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -653,6 +653,13 @@ Local_arguments ()
done
}
+# Reading system configuration
+if [ -f "${SYSTEM_LH_CONFFILE}" ]
+then
+ Echo_verbose "Using system defaults from ${SYSTEM_LH_CONFFILE}"
+ Read_conffile "${SYSTEM_LH_CONFFILE}"
+fi
+
# Reading existing configuration
Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
@@ -661,12 +668,6 @@ Local_arguments "${@}"
# Setting defaults
Set_defaults
-if [ -f "${SYSTEM_LH_CONFFILE}" ]
-then
- Echo_verbose "Using system defaults from ${SYSTEM_LH_CONFFILE}"
- Read_conffile "${SYSTEM_LH_CONFFILE}"
-fi
-
if [ -n "${LH_CONFFILE}" ]
then
Read_conffile "${LH_CONFFILE}"
--
cgit v1.0