diff options
| author | Daniel Baumann <daniel@debian.org> | 2011-11-29 13:06:11 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-11-29 13:06:11 +0100 |
| commit | c9a7e8b3f60f8f99f6f1b869b6e842e6c4263fb8 (patch) | |
| tree | d38b5c93e82a529e1b10dacc8aedd4d960cd5715 /functions | |
| parent | f7462cb7b23408a7fe4e6c6584ed77530cb4f127 (diff) | |
| download | vyos-live-build-c9a7e8b3f60f8f99f6f1b869b6e842e6c4263fb8.tar.gz vyos-live-build-c9a7e8b3f60f8f99f6f1b869b6e842e6c4263fb8.zip | |
Inverting logic for defaults or archive-areas wrt/ parent and derivatives.
Diffstat (limited to 'functions')
| -rwxr-xr-x | functions/defaults.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index 316640645..3b83eed51 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -597,18 +597,18 @@ Set_defaults () # Setting archive areas value case "${LB_MODE}" in progress) - LB_PARENT_ARCHIVE_AREAS="${LB_PARENT_ARCHIVE_AREAS:-main}" LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-main}" + LB_PARENT_ARCHIVE_AREAS="${LB_PARENT_ARCHIVE_AREAS:-${LB_ARCHIVE_AREAS}}" ;; ubuntu|kubuntu) - LB_PARENT_ARCHIVE_AREAS="${LB_PARENT_ARCHIVE_AREAS:-main restricted}" - LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-${LB_PARENT_ARCHIVE_AREAS}}" + LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-main restricted}" + LB_PARENT_ARCHIVE_AREAS="${LB_PARENT_ARCHIVE_AREAS:-${LB_ARCHIVE_AREAS}}" ;; *) - LB_PARENT_ARCHIVE_AREAS="${LB_PARENT_ARCHIVE_AREAS:-main}" - LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-${LB_PARENT_ARCHIVE_AREAS}}" + LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-main}" + LB_PARENT_ARCHIVE_AREAS="${LB_PARENT_ARCHIVE_AREAS:-${LB_ARCHIVE_AREAS}}" ;; esac |