From 48c24d0b1bf75a03acc06b96481def95d35a3704 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 27 Sep 2007 21:54:23 -0300 Subject: bootstrap: add support to include and exclude packages To allow better customization of resulting system, support to include and exclude packages of base system has been added. It has been included for debootstrap and cdebootstrap helpers. --- functions/defaults.sh | 6 ++++++ helpers/lh_bootstrap_cdebootstrap | 10 ++++++++++ helpers/lh_bootstrap_debootstrap | 10 ++++++++++ helpers/lh_config | 8 ++++++++ 4 files changed, 34 insertions(+) diff --git a/functions/defaults.sh b/functions/defaults.sh index 5d971d8..994bc2b 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -278,6 +278,12 @@ Set_defaults () fi fi + # Include packages on base + # LH_BOOTSTRAP_INCLUDE + + # Exclude packages on base + # LH_BOOTSTRAP_EXCLUDE + # Setting distribution configuration value # LH_BOOTSTRAP_CONFIG diff --git a/helpers/lh_bootstrap_cdebootstrap b/helpers/lh_bootstrap_cdebootstrap index 084a378..e2b627b 100755 --- a/helpers/lh_bootstrap_cdebootstrap +++ b/helpers/lh_bootstrap_cdebootstrap @@ -69,6 +69,16 @@ then CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --suite-config=${LH_BOOTSTRAP_CONFIG}" fi +if [ -n "${LH_BOOTSTRAP_INCLUDE}" ] +then + CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --include=${LH_BOOTSTRAP_INCLUDE}" +fi + +if [ -n "${LH_BOOTSTRAP_EXCLUDE}" ] +then + CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --exclude=${LH_BOOTSTRAP_EXCLUDE}" +fi + if [ -n "${LH_BOOTSTRAP_KEYRING}" ] then CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --keyring=${LH_BOOTSTRAP_KEYRING}" diff --git a/helpers/lh_bootstrap_debootstrap b/helpers/lh_bootstrap_debootstrap index 99df978..3be3968 100755 --- a/helpers/lh_bootstrap_debootstrap +++ b/helpers/lh_bootstrap_debootstrap @@ -69,6 +69,16 @@ then LH_DEBOOTSTRAP_SCRIPT="/usr/lib/debootstrap/scripts/${LH_BOOTSTRAP_CONFIG}" fi +if [ -n "${LH_BOOTSTRAP_INCLUDE}" ] +then + DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --include=${LH_BOOTSTRAP_INCLUDE}" +fi + +if [ -n "${LH_BOOTSTRAP_EXCLUDE}" ] +then + DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --exclude=${LH_BOOTSTRAP_EXCLUDE}" +fi + if [ "${LH_VERBOSE}" = "true" ] then DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --verbose" diff --git a/helpers/lh_config b/helpers/lh_config index bfcb316..2b279cd 100755 --- a/helpers/lh_config +++ b/helpers/lh_config @@ -722,6 +722,14 @@ LH_ARCHITECTURE="${LH_ARCHITECTURE}" # (Default: empty) LH_BOOTSTRAP_CONFIG="${LH_BOOTSTRAP_CONFIG}" +# \$LH_BOOTSTRAP_INCLUDE: include packages on base +# (Default: empty) +LH_BOOTSTRAP_INCLUDE="${LH_BOOTSTRAP_INCLUDE}" + +# \$LH_BOOTSTRAP_EXCLUDE: exclude packages on base +# (Default: empty) +LH_BOOTSTRAP_EXCLUDE="${LH_BOOTSTRAP_EXCLUDE}" + # \$LH_BOOTSTRAP_FLAVOUR: select flavour to use # (Default: ${LH_BOOTSTRAP_FLAVOUR}) LH_BOOTSTRAP_FLAVOUR="${LH_BOOTSTRAP_FLAVOUR}" -- cgit v1.0