From 2eecd1b814f7caa7e29ae744fec6cc59e1c77018 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 10 Dec 2014 07:41:29 +0100 Subject: Cleaning up from python removal (LIVE_IMAGE_ARCHIVE_AREAS). --- functions/defaults.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'functions') diff --git a/functions/defaults.sh b/functions/defaults.sh index 0a4e68e09..257e6dc0d 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -51,27 +51,27 @@ New_configuration () export LB_ARCHITECTURES # Image: Archive Areas - LIVE_IMAGE_ARCHIVE_AREAS="${LIVE_IMAGE_ARCHIVE_AREAS:-$(Get_configuration config/build Archive-Areas)}" + LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-$(Get_configuration config/build Archive-Areas)}" case "${LB_MODE}" in progress-linux) - LIVE_IMAGE_ARCHIVE_AREAS="${LIVE_IMAGE_ARCHIVE_AREAS:-main contrib non-free}" + LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-main contrib non-free}" ;; ubuntu) - LIVE_IMAGE_ARCHIVE_AREAS="${LIVE_IMAGE_ARCHIVE_AREAS:-main restricted}" + LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-main restricted}" ;; *) - LIVE_IMAGE_ARCHIVE_AREAS="${LIVE_IMAGE_ARCHIVE_AREAS:-main}" + LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-main}" ;; esac - export LIVE_IMAGE_ARCHIVE_AREAS + export LB_ARCHIVE_AREAS # Image: Archive Areas LIVE_IMAGE_PARENT_ARCHIVE_AREAS="${LIVE_IMAGE_PARENT_ARCHIVE_AREAS:-$(Get_configuration config/build Parent-Archive-Areas)}" - LIVE_IMAGE_PARENT_ARCHIVE_AREAS="${LIVE_IMAGE_PARENT_ARCHIVE_AREAS:-${LIVE_IMAGE_ARCHIVE_AREAS}}" + LIVE_IMAGE_PARENT_ARCHIVE_AREAS="${LIVE_IMAGE_PARENT_ARCHIVE_AREAS:-${LB_ARCHIVE_AREAS}}" export LIVE_IMAGE_PARENT_ARCHIVE_AREAS # Image: Type -- cgit v1.2.3