summaryrefslogtreecommitdiff
path: root/helpers/lh_config
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2008-06-10 19:04:23 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:03:34 +0100
commit76319632a1c66eb2dbc7305e855b0518ac0a4879 (patch)
tree63dab132c4d9d5964532efd77c0223a851bf787e /helpers/lh_config
parent4c4e58ca20774c45b4e4d6dd42267259d25141ee (diff)
downloadlive-build-76319632a1c66eb2dbc7305e855b0518ac0a4879.zip
live-build-76319632a1c66eb2dbc7305e855b0518ac0a4879.tar.gz
Correcting order where system-wide lh_config defaults file is read, thanks to Juergen Fiedler <juergen.fiedler@gmail.com>.
Diffstat (limited to 'helpers/lh_config')
-rwxr-xr-xhelpers/lh_config13
1 files 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}"