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

[Daniel Baumann]

The branch, master has been updated
       via  beebfa63ae2e82fd30f56efb67848dd32494f668 (commit)
       via  eaadafff8e8b15cc474a9859252877cd1fd02a8c (commit)
      from  779a9dbe2e53c5afdaf587d4ed72ad024b48284c (commit)


- Shortlog ------------------------------------------------------------
beebfa6 Setting LH_BOOTSTRAP_FLAVOUR only when using cdebootstrap.
eaadaff Fixing typing error (wrong variable name).

Summary of changes:
 functions/defaults.sh            |    6 +++++-
 helpers/lh_bootstrap_debootstrap |    4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit beebfa63ae2e82fd30f56efb67848dd32494f668
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Oct 31 10:55:37 2007 +0100

    Setting LH_BOOTSTRAP_FLAVOUR only when using cdebootstrap.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index 8a876f0..30e4062 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -226,7 +226,11 @@ Set_defaults ()
 	# LH_BOOTSTRAP_CONFIG
 
 	# Setting flavour value
-	LH_BOOTSTRAP_FLAVOUR="${LH_BOOTSTRAP_FLAVOUR:-standard}"
+	case "${LH_BOOTSTRAP}" in
+		cdebootstrap)
+			LH_BOOTSTRAP_FLAVOUR="${LH_BOOTSTRAP_FLAVOUR:-standard}"
+			;;
+	esac
 
 	# Setting boostrap keyring
 	# LH_BOOTSTRAP_KEYRING

commit eaadafff8e8b15cc474a9859252877cd1fd02a8c
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Oct 31 10:49:38 2007 +0100

    Fixing typing error (wrong variable name).

diff --git a/helpers/lh_bootstrap_debootstrap b/helpers/lh_bootstrap_debootstrap
index 101ab95..3ae6075 100755
--- a/helpers/lh_bootstrap_debootstrap
+++ b/helpers/lh_bootstrap_debootstrap
@@ -86,11 +86,11 @@ if [ -z "${LH_BOOTSTRAP_FLAVOUR}" ]
 then
 	case "${LH_PACKAGES_LISTS}" in
 		minimal|mini)
-			DEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --variant=buildd"
+			DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=buildd"
 			;;
 	esac
 else
-	DEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --variant=${LH_BOOTSTRAP_FLAVOUR}"
+	DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=${LH_BOOTSTRAP_FLAVOUR}"
 fi
 
 if [ "${LH_VERBOSE}" = "true" ]

-- 
debian-live/live-helper