summaryrefslogtreecommitdiff
path: root/helpers
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2009-11-11 16:30:42 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:09:48 +0100
commit22c6dc6149967379dd7ab65f8ea59bc94054acc7 (patch)
tree3814bf0c9d806970e1282b34635513758ee1ec81 /helpers
parent82277aec3ba8f40daa3a8bc497ceed89f2ab8465 (diff)
downloadvyos-live-build-22c6dc6149967379dd7ab65f8ea59bc94054acc7.tar.gz
vyos-live-build-22c6dc6149967379dd7ab65f8ea59bc94054acc7.zip
Adding patch from Dusty Hendrickson <dhendrickson@cleversafe.com> to allow lh_bootstrap_debootstrap to bootstrap from different section than main and evaluate LH_CATEGORIES for that purpose.
Diffstat (limited to 'helpers')
-rwxr-xr-xhelpers/lh_bootstrap_debootstrap6
1 files changed, 6 insertions, 0 deletions
diff --git a/helpers/lh_bootstrap_debootstrap b/helpers/lh_bootstrap_debootstrap
index 0c296b6d7..3f977b59b 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/" ]