diff options
| author | Daniel Baumann <daniel@debian.org> | 2009-01-31 16:33:56 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:09:41 +0100 |
| commit | 695cdf15306327c9c78f2b4c25995485f64c95c6 (patch) | |
| tree | 065b86bc26e98b039085e8cba1471880a95cf20b | |
| parent | b038c34072025c217afd26a6e6bc1395e3913124 (diff) | |
| download | vyos-live-build-695cdf15306327c9c78f2b4c25995485f64c95c6.tar.gz vyos-live-build-695cdf15306327c9c78f2b4c25995485f64c95c6.zip | |
Fixing infinit loop when using autoconfig for lh_config and lh_clean.
| -rwxr-xr-x | helpers/lh_clean | 15 | ||||
| -rwxr-xr-x | helpers/lh_config | 7 |
2 files changed, 14 insertions, 8 deletions
diff --git a/helpers/lh_clean b/helpers/lh_clean index 250742428..bb3d28f93 100755 --- a/helpers/lh_clean +++ b/helpers/lh_clean @@ -10,10 +10,13 @@ set -e # Read meta config -if [ "${1}" != "autoconfig" ] && [ -x scripts/clean ] +if [ "${1}" != "noautoconfig" ] && [ -x scripts/clean ] then ./scripts/clean ${@} -else +fi + +if [ "${1}" = "noautoconfig" ] +then shift fi @@ -51,10 +54,10 @@ for ARGUMENT in ${ARGUMENTS} do case "${ARGUMENT}" in --all) - "${0}" --chroot - "${0}" --binary - "${0}" --stage - "${0}" --source + "${0}" noautoconfig --chroot + "${0}" noautoconfig --binary + "${0}" noautoconfig --stage + "${0}" noautoconfig --source if [ -d scripts ] then diff --git a/helpers/lh_config b/helpers/lh_config index ff33de947..c0cd61839 100755 --- a/helpers/lh_config +++ b/helpers/lh_config @@ -10,10 +10,13 @@ set -e # Read meta config -if [ "${1}" != "autoconfig" ] && [ -x scripts/config ] +if [ "${1}" != "noautoconfig" ] && [ -x scripts/config ] then ./scripts/config ${@} -else +fi + +if [ "${1}" = "noautoconfig" ] +then shift fi |