[SCM] debian-live/live-helper branch, master, updated. 1.0_a35-1-7-g1d728dc

[Daniel Baumann]

The branch, master has been updated
       via  1d728dcb3e7bdf84acfd99cd1ac3b27006991a31 (commit)
      from  792289214676915f9747f4219f86f498855eacf9 (commit)


- Shortlog ------------------------------------------------------------
1d728dc Allowing LH_BOOTSTRAP_FLAVOUR to be minimal or mini.

Summary of changes:
 helpers/lh_bootstrap_cdebootstrap |   10 +++++++++-
 helpers/lh_bootstrap_debootstrap  |    9 ++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 1d728dcb3e7bdf84acfd99cd1ac3b27006991a31
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Nov 11 13:02:32 2007 +0100

    Allowing LH_BOOTSTRAP_FLAVOUR to be minimal or mini.

diff --git a/helpers/lh_bootstrap_cdebootstrap b/helpers/lh_bootstrap_cdebootstrap
index 0045b21..56e05a0 100755
--- a/helpers/lh_bootstrap_cdebootstrap
+++ b/helpers/lh_bootstrap_cdebootstrap
@@ -98,7 +98,15 @@ then
 			;;
 	esac
 else
-	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=${LH_BOOTSTRAP_FLAVOUR}"
+	case "${LH_BOOTSTRAP_FLAVOUR}" in
+		minimal|mini)
+			CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=minimal"
+			;;
+
+		*)
+			CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=${LH_BOOTSTRAP_FLAVOUR}"
+			;;
+	esac
 fi
 
 if [ "${LH_DEBUG}" = "enabled" ]
diff --git a/helpers/lh_bootstrap_debootstrap b/helpers/lh_bootstrap_debootstrap
index 838a3de..69d9cd0 100755
--- a/helpers/lh_bootstrap_debootstrap
+++ b/helpers/lh_bootstrap_debootstrap
@@ -92,7 +92,14 @@ then
 				;;
 		esac
 	else
-		DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=${LH_BOOTSTRAP_FLAVOUR}"
+		case "${LH_BOOTSTRAP_FLAVOUR}" in
+			minimal|mini)
+				DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=buildd"
+				;;
+
+			*)
+				DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=${LH_BOOTSTRAP_FLAVOUR}"
+		esac
 	fi
 else
 	DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=fakechroot"

-- 
debian-live/live-helper