[SCM] Debian Live build scripts branch, master, updated. 1.0.2-4-43-g699131f

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 7dde5ff4ea53b4f746bc9df28a36b4888148d20c
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Jan 30 21:17:00 2009 +0100

    Replacing previous attempt of using config.cfg, now using scripts/config.sh and scripts/clean.sh instead.

diff --git a/helpers/lh_clean b/helpers/lh_clean
index 1cd18a2..b4cf122 100755
--- a/helpers/lh_clean
+++ b/helpers/lh_clean
@@ -9,6 +9,14 @@
 
 set -e
 
+# Read meta config
+if [ "${1}" != "autoconfig" ] && [ -e scripts/clean.sh ]
+then
+	sh scripts/clean.sh ${@}
+else
+	shift
+fi
+
 # Including common functions
 . "${LH_BASE:-/usr/share/live-helper}"/functions.sh
 
diff --git a/helpers/lh_config b/helpers/lh_config
index 642423f..a752f50 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -9,6 +9,14 @@
 
 set -e
 
+# Read meta config
+if [ "${1}" != "autoconfig" ] && [ -e scripts/config.sh ]
+then
+	sh scripts/config.sh ${@}
+else
+	shift
+fi
+
 # Including common functions
 . "${LH_BASE:-/usr/share/live-helper}"/functions.sh
 
@@ -710,15 +718,7 @@ fi
 # Reading existing configuration
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 
-if [ -x config.cfg ]
-then
-	Local_arguments "$(./config.cfg) ${@}"
-elif [ -r config.cfg ]
-then
-	Local_arguments "$(sed -e '/^$/d' -e '/^#/d' config.cfg | sed -e '$!N;s/\n/ /g') ${@}"
-else
-	Local_arguments "${@}"
-fi
+Local_arguments "${@}"
 
 if [ -n "${_CONFFILE}" ]
 then

-- 
Debian Live build scripts