[SCM] live-helper branch, master, updated. 1.0.5-2-61-g43a6c0f
Daniel Baumann
daniel at debian.org
Wed Nov 11 16:27:55 UTC 2009
The following commit has been merged in the master branch:
commit 05a6970e7485d1a274fe7a7efea15befdd724736
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Nov 11 16:30:42 2009 +0100
Adding patch from Dusty Hendrickson <dhendrickson at cleversafe.com> to allow lh_bootstrap_debootstrap to bootstrap from different section than main and evaluate LH_CATEGORIES for that purpose.
diff --git a/helpers/lh_bootstrap_debootstrap b/helpers/lh_bootstrap_debootstrap
index 0c296b6..3f977b5 100755
--- a/helpers/lh_bootstrap_debootstrap
+++ b/helpers/lh_bootstrap_debootstrap
@@ -57,6 +57,12 @@ then
DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --arch ${LH_ARCHITECTURE}"
fi
+if [ "${LH_CATEGORIES}" != "main" ]
+then
+ # Modify categories to remove leading/trailing whitespaces and replace other whitepspace with commas
+ DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --components $(echo ${LH_CATEGORIES} | sed -E -e 's/^[ \t]*//;s/[ \t]*$//' -e 's/[ \t]+/,/g')"
+fi
+
if [ -n "${LH_BOOTSTRAP_CONFIG}" ]
then
if [ -d "/usr/share/debootstrap/scripts/" ]
--
live-helper
More information about the debian-live-changes
mailing list