diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-12-19 21:41:25 +0100 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2013-05-06 14:50:03 +0200 |
| commit | 4c7518fd76f8d6f30467e3eaea11ae26d9273cda (patch) | |
| tree | ce663a129b29c25a3a8f9190dceeb1e1169d2ec5 /functions | |
| parent | bcde01785465ba7faf7e953f5dc0c15018494c5f (diff) | |
| download | vyos-live-build-4c7518fd76f8d6f30467e3eaea11ae26d9273cda.tar.gz vyos-live-build-4c7518fd76f8d6f30467e3eaea11ae26d9273cda.zip | |
Moving off binary image archive areas into new config tree format.
Diffstat (limited to 'functions')
| -rwxr-xr-x | functions/defaults.sh | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index de176331f..d93c56ebf 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -50,6 +50,25 @@ New_configuration () LIVE_IMAGE_ARCHITECTURE="${LIVE_IMAGE_ARCHITECTURE:-${CURRENT_IMAGE_ARCHITECTURE}}" export LIVE_IMAGE_ARCHITECTURE + # Image: Archive Areas + LIVE_IMAGE_ARCHIVE_AREAS="$(Get_configuration config/control Archive-Areas)" + + case "${LB_MODE}" in + progress-linux) + LIVE_IMAGE_ARCHIVE_AREAS="${LIVE_IMAGE_ARCHIVE_AREAS:-main contrib non-free}" + ;; + + ubuntu) + LIVE_IMAGE_ARCHIVE_AREAS="${LIVE_IMAGE_ARCHIVE_AREAS:-main restricted}" + ;; + + *) + LIVE_IMAGE_ARCHIVE_AREAS="${LIVE_IMAGE_ARCHIVE_AREAS:-main}" + ;; + esac + + export LIVE_IMAGE_ARCHIVE_AREAS + # Image: Type LIVE_IMAGE_TYPE="$(Get_configuration config/control Type)" LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE:-iso-hybrid}" @@ -589,18 +608,15 @@ Set_defaults () # Setting archive areas value case "${LB_MODE}" in progress-linux) - LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-main contrib non-free}" - LB_PARENT_ARCHIVE_AREAS="${LB_PARENT_ARCHIVE_AREAS:-${LB_ARCHIVE_AREAS}}" + LB_PARENT_ARCHIVE_AREAS="${LB_PARENT_ARCHIVE_AREAS:-${LIVE_IMAGE_ARCHIVE_AREAS}}" ;; ubuntu) - 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:-${LIVE_IMAGE_ARCHIVE_AREAS}}" ;; *) - LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-main}" - LB_PARENT_ARCHIVE_AREAS="${LB_PARENT_ARCHIVE_AREAS:-${LB_ARCHIVE_AREAS}}" + LB_PARENT_ARCHIVE_AREAS="${LB_PARENT_ARCHIVE_AREAS:-${LIVE_IMAGE_ARCHIVE_AREAS}}" ;; esac |