diff options
| author | Daniel Baumann <daniel@debian.org> | 2009-01-23 05:02:42 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:09:40 +0100 |
| commit | 84e4a199da6a60377f269b654457af478e692ac8 (patch) | |
| tree | a3f5fa9daedb807b132b6f9b9f9ab922f4cf87de | |
| parent | 451d36016c116b552604cfe1d05f181894cdba69 (diff) | |
| download | vyos-live-build-84e4a199da6a60377f269b654457af478e692ac8.tar.gz vyos-live-build-84e4a199da6a60377f269b654457af478e692ac8.zip | |
Setting default taskel program from aptitude to tasksel.
| -rwxr-xr-x | functions/defaults.sh | 2 | ||||
| -rwxr-xr-x | helpers/lh_config | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index e7eb2f56a..ae5c87940 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 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 |