From 84e4a199da6a60377f269b654457af478e692ac8 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Fri, 23 Jan 2009 05:02:42 +0100
Subject: Setting default taskel program from aptitude to tasksel.
---
functions/defaults.sh | 2 +-
helpers/lh_config | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/functions/defaults.sh b/functions/defaults.sh
index e7eb2f5..ae5c879 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -191,7 +191,7 @@ Set_defaults ()
fi
# Setting tasksel
- LH_TASKSEL="${LH_TASKSEL:-aptitude}"
+ LH_TASKSEL="${LH_TASKSEL:-taskel}"
# Setting root directory
if [ -z "${LH_ROOT}" ]
diff --git a/helpers/lh_config b/helpers/lh_config
index 1bbb2d4..c92d4c9 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
--
cgit v1.0