diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-12-13 19:04:14 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-12-13 19:04:23 +0100 |
| commit | 0fa142780127458b3bd3a1affe4ba0094b3c6ec3 (patch) | |
| tree | 1d5848bb1bb83c966f9d043a980207fd5bd7c9ca /scripts/build | |
| parent | 3f19c0c3576f067b827aade6be90041eb57fcf0c (diff) | |
| download | vyos-live-build-0fa142780127458b3bd3a1affe4ba0094b3c6ec3.tar.gz vyos-live-build-0fa142780127458b3bd3a1affe4ba0094b3c6ec3.zip | |
Avoid re-populating an already populated configuration tree when using lb config --config.
Diffstat (limited to 'scripts/build')
| -rwxr-xr-x | scripts/build/config | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/scripts/build/config b/scripts/build/config index b563ee955..33429bb8d 100755 --- a/scripts/build/config +++ b/scripts/build/config @@ -872,6 +872,16 @@ then _CONFIG="" fi +if [ -e .build/config ] && [ -n "${_CONFIG}" ] +then + if [ "${1}" != "noauto" ] + then + Echo_message "Ignoring --config ${_CONFIG}: ${PWD} is already a live-build configuration tree" + fi + + _CONFIG="" +fi + if [ -n "${_CONFIG}" ] then if [ -e "${_CONFIG}" ] || [ -e "/usr/share/live/images/${_CONFIG}" ] |