summaryrefslogtreecommitdiff
path: root/helpers
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2009-01-23 05:02:42 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:09:40 +0100
commit84e4a199da6a60377f269b654457af478e692ac8 (patch)
treea3f5fa9daedb807b132b6f9b9f9ab922f4cf87de /helpers
parent451d36016c116b552604cfe1d05f181894cdba69 (diff)
downloadvyos-live-build-84e4a199da6a60377f269b654457af478e692ac8.tar.gz
vyos-live-build-84e4a199da6a60377f269b654457af478e692ac8.zip
Setting default taskel program from aptitude to tasksel.
Diffstat (limited to 'helpers')
-rwxr-xr-xhelpers/lh_config6
1 files changed, 3 insertions, 3 deletions
diff --git a/helpers/lh_config b/helpers/lh_config
index 1bbb2d48f..c92d4c9d5 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -716,13 +716,13 @@ Read_conffiles config/all config/common config/bootstrap config/chroot config/bi
if [ -x config.cfg ]
then
- EXTRA_ARGUMENTS="./config.cfg"
+ EXTRA_ARGUMENTS="$(./config.cfg)"
elif [ -r config.cfg ]
then
- EXTRA_ARGUMENTS="$(cat config.cfg)"
+ EXTRA_ARGUMENTS="$(sed -e '/^$/d' -e '/^#/d' config.cfg | sed -e '$!N;s/\n/ /g')"
fi
-Local_arguments ${EXTRA_ARGUMENTS} "${@}"
+Local_arguments "${EXTRA_ARGUMENTS} ${@}"
if [ -n "${_CONFFILE}" ]
then