summaryrefslogtreecommitdiff
path: root/helpers
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2009-01-28 01:15:03 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:09:40 +0100
commitdd74cb6b4717a9afa5ba392c604d4bd7815014a7 (patch)
tree9b5b2aa0b0fae32d412f42e7fac486030c2c0561 /helpers
parentc3dad3f18f57ad15f91495971a5fc1bd736115d5 (diff)
downloadvyos-live-build-dd74cb6b4717a9afa5ba392c604d4bd7815014a7.tar.gz
vyos-live-build-dd74cb6b4717a9afa5ba392c604d4bd7815014a7.zip
Correcting lh_configs config.cfg handling, so that it's at least working when not using config.cfg. Will have to be fixed properly later.
Diffstat (limited to 'helpers')
-rwxr-xr-xhelpers/lh_config8
1 files changed, 4 insertions, 4 deletions
diff --git a/helpers/lh_config b/helpers/lh_config
index 6239345b2..642423f7a 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -712,14 +712,14 @@ Read_conffiles config/all config/common config/bootstrap config/chroot config/bi
if [ -x config.cfg ]
then
- EXTRA_ARGUMENTS="$(./config.cfg)"
+ Local_arguments "$(./config.cfg) ${@}"
elif [ -r config.cfg ]
then
- EXTRA_ARGUMENTS="$(sed -e '/^$/d' -e '/^#/d' config.cfg | sed -e '$!N;s/\n/ /g')"
+ Local_arguments "$(sed -e '/^$/d' -e '/^#/d' config.cfg | sed -e '$!N;s/\n/ /g') ${@}"
+else
+ Local_arguments "${@}"
fi
-Local_arguments "${EXTRA_ARGUMENTS} ${@}"
-
if [ -n "${_CONFFILE}" ]
then
Read_conffiles "${_CONFFILE}"