[SCM] debian-live branch, master, updated. 1.0_a47-1-5-g0c15f64

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 0c15f64d5b27bb81ddd7677e294a74b08a1ddb1f
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Jun 10 19:04:23 2008 +0200

    Correcting order where system-wide lh_config defaults file is read, thanks to Juergen Fiedler <juergen.fiedler at gmail.com>.

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}"

-- 
debian-live