From 81fb4294538a7204232d3e76195a778df0ee3ee1 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 29 Jul 2012 00:24:11 +0200
Subject: Dropping global package-lists entirely, only local package lists
 within the config tree are support.

---
 scripts/build/lb_bootstrap_cdebootstrap | 28 ++--------------------------
 1 file changed, 2 insertions(+), 26 deletions(-)

(limited to 'scripts/build/lb_bootstrap_cdebootstrap')

diff --git a/scripts/build/lb_bootstrap_cdebootstrap b/scripts/build/lb_bootstrap_cdebootstrap
index ba7ea8a23..585a9d448 100755
--- a/scripts/build/lb_bootstrap_cdebootstrap
+++ b/scripts/build/lb_bootstrap_cdebootstrap
@@ -76,26 +76,9 @@ then
 	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --keyring=${LB_BOOTSTRAP_KEYRING}"
 fi
 
-if [ -z "${LB_BOOTSTRAP_FLAVOUR}" ]
+if [ -n "${LB_BOOTSTRAP_FLAVOUR}" ]
 then
-	case "${LB_PACKAGE_LISTS}" in
-		stripped|minimal)
-			CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=minimal"
-			;;
-		*)
-			CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=standard"
-			;;
-	esac
-else
-	case "${LB_BOOTSTRAP_FLAVOUR}" in
-		stripped|minimal)
-			CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=minimal"
-			;;
-
-		*)
-			CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=${LB_BOOTSTRAP_FLAVOUR}"
-			;;
-	esac
+	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=${LB_BOOTSTRAP_FLAVOUR}"
 fi
 
 if [ "${_DEBUG}" = "true" ]
@@ -152,13 +135,6 @@ then
 		${LB_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot
 	fi
 
-	# Remove cdebootstrap-helper-diverts (needed at least for minimal flavours)
-	case "${LB_PACKAGE_LISTS}" in
-		stripped|minimal)
-			Chroot chroot "dpkg -P cdebootstrap-helper-diverts"
-			;;
-	esac
-
 	# Deconfiguring cdebootstrap configurations
 	rm -f chroot/etc/apt/sources.list
 	rm -f chroot/etc/hosts
-- 
cgit v1.2.3