From 730b24850784a6dca39f26c880c8253fb24bdd78 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Fri, 30 Jan 2009 21:17:00 +0100
Subject: Replacing previous attempt of using config.cfg, now using
 scripts/config.sh and scripts/clean.sh instead.

---
 helpers/lh_clean  |  8 ++++++++
 helpers/lh_config | 18 +++++++++---------
 2 files changed, 17 insertions(+), 9 deletions(-)

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
-- 
cgit v1.0