summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2009-01-30 21:17:00 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:09:40 +0100
commit730b24850784a6dca39f26c880c8253fb24bdd78 (patch)
tree32c88d490b6bb6692a116b408e617e0e7a86a9df
parent992a145afd7bec1b18d356909392d5c6bf20add5 (diff)
downloadlive-build-730b24850784a6dca39f26c880c8253fb24bdd78.zip
live-build-730b24850784a6dca39f26c880c8253fb24bdd78.tar.gz
Replacing previous attempt of using config.cfg, now using scripts/config.sh and scripts/clean.sh instead.
-rwxr-xr-xhelpers/lh_clean8
-rwxr-xr-xhelpers/lh_config18
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