[SCM] Debian Live build scripts branch, master, updated. 1.0.2-4-14-gf4a4bb8

[Daniel Baumann]

The following commit has been merged in the master branch:
commit f4a4bb83b77bf9224ffe5f641d86903e2e2c8584
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Jan 16 15:48:01 2009 +0100

    If config.cfg is executable, we execute it and accept its output as extra arguments. This makes dynamic configuration possible.

diff --git a/helpers/lh_config b/helpers/lh_config
index 2cb1126..c2137ad 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -714,13 +714,16 @@ fi
 # Reading existing configuration
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 
-if [ -e config.cfg ]
+if [ -x config.cfg ]
 then
-	Local_arguments $(cat config.cfg) "${@}"
-else
-	Local_arguments "${@}"
+	EXTRA_ARGUMENTS="./config.cfg"
+elif [ -r config.cfg ]
+then
+	EXTRA_ARGUMENTS="$(cat config.cfg)"
 fi
 
+Local_arguments ${EXTRA_ARGUMENTS} "${@}"
+
 if [ -n "${_CONFFILE}" ]
 then
 	Read_conffiles "${_CONFFILE}"

-- 
Debian Live build scripts