diff options
| author | Daniel Baumann <daniel@debian.org> | 2009-01-30 21:17:00 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:09:40 +0100 |
| commit | 730b24850784a6dca39f26c880c8253fb24bdd78 (patch) | |
| tree | 32c88d490b6bb6692a116b408e617e0e7a86a9df /helpers/lh_config | |
| parent | 992a145afd7bec1b18d356909392d5c6bf20add5 (diff) | |
| download | vyos-live-build-730b24850784a6dca39f26c880c8253fb24bdd78.tar.gz vyos-live-build-730b24850784a6dca39f26c880c8253fb24bdd78.zip | |
Replacing previous attempt of using config.cfg, now using scripts/config.sh and scripts/clean.sh instead.
Diffstat (limited to 'helpers/lh_config')
| -rwxr-xr-x | helpers/lh_config | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/helpers/lh_config b/helpers/lh_config index 642423f7a..a752f50cd 100755 --- a/helpers/lh_config +++ b/helpers/lh_config @@ -9,6 +9,14 @@ set -e +# Read meta config +if [ "${1}" != "autoconfig" ] && [ -e scripts/config.sh ] +then + sh scripts/config.sh ${@} +else + shift +fi + # Including common functions . "${LH_BASE:-/usr/share/live-helper}"/functions.sh @@ -710,15 +718,7 @@ fi # Reading existing configuration Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source -if [ -x config.cfg ] -then - Local_arguments "$(./config.cfg) ${@}" -elif [ -r config.cfg ] -then - Local_arguments "$(sed -e '/^$/d' -e '/^#/d' config.cfg | sed -e '$!N;s/\n/ /g') ${@}" -else - Local_arguments "${@}" -fi +Local_arguments "${@}" if [ -n "${_CONFFILE}" ] then |