[SCM] Debian Live build scripts branch, master, updated. 1.0.2-4-16-gc10b6c7

[Daniel Baumann]

The following commit has been merged in the master branch:
commit c10b6c741f1d11ff7eb8ede287bc7feb1772cb45
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Jan 23 05:02:42 2009 +0100

    Setting default taskel program from aptitude to tasksel.

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

-- 
Debian Live build scripts