diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2007-09-27 21:54:23 -0300 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 18:22:27 +0100 |
| commit | 48c24d0b1bf75a03acc06b96481def95d35a3704 (patch) | |
| tree | af4654ac9dcb8f8f7f322f6a0ada4f6f8ad98ee3 | |
| parent | abde3ce0d04e76294b7fa5e53db76c8a0bce4f11 (diff) | |
| download | vyos-live-build-48c24d0b1bf75a03acc06b96481def95d35a3704.tar.gz vyos-live-build-48c24d0b1bf75a03acc06b96481def95d35a3704.zip | |
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.
| -rwxr-xr-x | functions/defaults.sh | 6 | ||||
| -rwxr-xr-x | helpers/lh_bootstrap_cdebootstrap | 10 | ||||
| -rwxr-xr-x | helpers/lh_bootstrap_debootstrap | 10 | ||||
| -rwxr-xr-x | helpers/lh_config | 8 |
4 files changed, 34 insertions, 0 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index 5d971d86b..994bc2baa 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 084a37817..e2b627be0 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 99df978b1..3be396800 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 bfcb3165d..2b279cd90 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}" |