summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-10-30 06:35:35 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 18:22:28 +0100
commitc8bb19dd48f0047de85cda401a7ba5e037e6db4a (patch)
tree2d0495e322966597a0354d2554dc4c508066364d
parent3e3576989c49d78249072ecd6160a1c8bd1d1cf8 (diff)
downloadvyos-live-build-c8bb19dd48f0047de85cda401a7ba5e037e6db4a.tar.gz
vyos-live-build-c8bb19dd48f0047de85cda401a7ba5e037e6db4a.zip
Respecting LH_BOOTSTRAP_FLAVOUR (Closes: #448034).
-rwxr-xr-xhelpers/lh_bootstrap_cdebootstrap21
-rwxr-xr-xhelpers/lh_bootstrap_debootstrap11
2 files changed, 24 insertions, 8 deletions
diff --git a/helpers/lh_bootstrap_cdebootstrap b/helpers/lh_bootstrap_cdebootstrap
index 616e1959c..0045b2195 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 c25b37928..101ab9551 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"