From 5123ca45477c8297dac700d16fff8c67f01bf791 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Wed, 19 Dec 2012 21:48:49 +0100
Subject: Moving off binary image parent archive areas into new config tree
 format.

---
 functions/defaults.sh | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

(limited to 'functions')

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
-- 
cgit v1.2.3