implement arrays holding apt options for core/base/extra/purge packages

This commit is contained in:
parazyd 2017-11-28 19:50:52 +01:00
parent b90aaecfb0
commit 8cec5f6c9d
No known key found for this signature in database
GPG Key ID: F0CB28FCF78637DE
2 changed files with 9 additions and 4 deletions

3
config
View File

@ -48,6 +48,7 @@ vm_name="${os}_${release}_${version}_${arch}_vagrant"
rootcredentials="root:toor" rootcredentials="root:toor"
usercredentials="devuan:devuan" usercredentials="devuan:devuan"
core_packages_option=()
core_packages=( core_packages=(
devuan-keyring devuan-keyring
debian-keyring debian-keyring
@ -62,6 +63,7 @@ core_packages=(
sysvinit sysvinit
) )
base_packages_option=()
base_packages=( base_packages=(
apt-utils apt-utils
parted parted
@ -87,6 +89,7 @@ base_packages=(
locales locales
) )
purge_packages_option=()
purge_packages+=( purge_packages+=(
dbus dbus
) )

View File

@ -18,6 +18,8 @@
# along with this source code. If not, see <http://www.gnu.org/licenses/>. # along with this source code. If not, see <http://www.gnu.org/licenses/>.
vars+=(bootstrap_tgz_stage3 bootstrap_tgz_stage4 TAR_STAGE4) vars+=(bootstrap_tgz_stage3 bootstrap_tgz_stage4 TAR_STAGE4)
arrs+=(base_packages_option core_packages_option extra_packages_option)
arrs+=(purge_packages_option)
bootstrap_complete_base() { bootstrap_complete_base() {
fn bootstrap_complete_base "$@" fn bootstrap_complete_base "$@"
@ -121,9 +123,9 @@ sed -i -e 's/KERNEL\!=\"eth\*|/KERNEL\!=\"/' \
rm -f /etc/udev/rules.d/70-persistent-net.rules rm -f /etc/udev/rules.d/70-persistent-net.rules
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive
apt-get --yes --force-yes install ${core_packages} apt-get --yes --force-yes install ${core_packages_option} ${core_packages}
apt-get --yes --force-yes install ${base_packages} apt-get --yes --force-yes install ${base_packages_option} ${base_packages}
apt-get --yes --force-yes purge ${purge_packages} apt-get --yes --force-yes purge ${purge_packages_option} ${purge_packages}
apt-get --yes --force-yes autoremove apt-get --yes --force-yes autoremove
apt-get clean apt-get clean
@ -202,7 +204,7 @@ done
} }
apt-get --yes --force-yes upgrade apt-get --yes --force-yes upgrade
apt-get --yes --force-yes install ${extra_packages} apt-get --yes --force-yes install ${extra_packages_option} ${extra_packages}
apt-get --yes --force-yes autoremove apt-get --yes --force-yes autoremove
apt-get clean apt-get clean