diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-12-19 21:48:49 +0100 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2013-05-06 14:50:03 +0200 |
| commit | 5123ca45477c8297dac700d16fff8c67f01bf791 (patch) | |
| tree | 62e5adb3b0cc080fa8c58eec1b9de63343ff2c6f /functions/defaults.sh | |
| parent | 8248ffd20f36d55f697812f92ff0335c82b38f1c (diff) | |
| download | vyos-live-build-5123ca45477c8297dac700d16fff8c67f01bf791.tar.gz vyos-live-build-5123ca45477c8297dac700d16fff8c67f01bf791.zip | |
Moving off binary image parent archive areas into new config tree format.
Diffstat (limited to 'functions/defaults.sh')
| -rwxr-xr-x | functions/defaults.sh | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index 686957457..588274dcf 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -69,6 +69,11 @@ New_configuration () export LIVE_IMAGE_ARCHIVE_AREAS + # Image: Archive Areas + LIVE_IMAGE_PARENT_ARCHIVE_AREAS="$(Get_configuration config/control Parent-Archive-Areas)" + LIVE_IMAGE_PARENT_ARCHIVE_AREAS="${LIVE_IMAGE_PARENT_ARCHIVE_AREAS:-${LIVE_IMAGE_ARCHIVE_AREAS}}" + export LIVE_IMAGE_PARENT_ARCHIVE_AREAS + # Image: Type LIVE_IMAGE_TYPE="$(Get_configuration config/control Type)" LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE:-iso-hybrid}" @@ -605,21 +610,6 @@ Set_defaults () ;; esac - # Setting archive areas value - case "${LB_MODE}" in - progress-linux) - LB_PARENT_ARCHIVE_AREAS="${LB_PARENT_ARCHIVE_AREAS:-${LIVE_IMAGE_ARCHIVE_AREAS}}" - ;; - - ubuntu) - LB_PARENT_ARCHIVE_AREAS="${LB_PARENT_ARCHIVE_AREAS:-${LIVE_IMAGE_ARCHIVE_AREAS}}" - ;; - - *) - LB_PARENT_ARCHIVE_AREAS="${LB_PARENT_ARCHIVE_AREAS:-${LIVE_IMAGE_ARCHIVE_AREAS}}" - ;; - esac - ## config/chroot # Setting chroot filesystem |