[SCM] debian-live/live-helper branch, master, updated. 1.0_a33-1-5-gd29dd22

[Daniel Baumann]

The branch, master has been updated
       via  d29dd22a7380dea631c003be501711e617dfc4af (commit)
      from  2e260e9e86f5964846692dd969705a7147c688d4 (commit)


- Shortlog ------------------------------------------------------------
d29dd22 Respecting LH_BOOTSTRAP_FLAVOUR (Closes: #448034).

Summary of changes:
 helpers/lh_bootstrap_cdebootstrap |   21 +++++++++++++--------
 helpers/lh_bootstrap_debootstrap  |   11 +++++++++++
 2 files changed, 24 insertions(+), 8 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit d29dd22a7380dea631c003be501711e617dfc4af
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Oct 30 06:35:35 2007 +0100

    Respecting LH_BOOTSTRAP_FLAVOUR (Closes: #448034).

diff --git a/helpers/lh_bootstrap_cdebootstrap b/helpers/lh_bootstrap_cdebootstrap
index 616e195..0045b21 100755
--- a/helpers/lh_bootstrap_cdebootstrap
+++ b/helpers/lh_bootstrap_cdebootstrap
@@ -87,14 +87,19 @@ then
     CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --keyring=${LH_BOOTSTRAP_KEYRING}"
 fi
 
-case "${LH_PACKAGES_LISTS}" in
-	minimal|mini)
-		CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=minimal"
-		;;
-	*)
-		CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=standard"
-		;;
-esac
+if [ -z "${LH_BOOTSTRAP_FLAVOUR}" ]
+then
+	case "${LH_PACKAGES_LISTS}" in
+		minimal|mini)
+			CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=minimal"
+			;;
+		*)
+			CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=standard"
+			;;
+	esac
+else
+	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=${LH_BOOTSTRAP_FLAVOUR}"
+fi
 
 if [ "${LH_DEBUG}" = "enabled" ]
 then
diff --git a/helpers/lh_bootstrap_debootstrap b/helpers/lh_bootstrap_debootstrap
index c25b379..101ab95 100755
--- a/helpers/lh_bootstrap_debootstrap
+++ b/helpers/lh_bootstrap_debootstrap
@@ -82,6 +82,17 @@ then
 	DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --exclude=${LH_BOOTSTRAP_EXCLUDE}"
 fi
 
+if [ -z "${LH_BOOTSTRAP_FLAVOUR}" ]
+then
+	case "${LH_PACKAGES_LISTS}" in
+		minimal|mini)
+			DEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --variant=buildd"
+			;;
+	esac
+else
+	DEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --variant=${LH_BOOTSTRAP_FLAVOUR}"
+fi
+
 if [ "${LH_VERBOSE}" = "true" ]
 then
 	DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --verbose"

-- 
debian-live/live-helper