diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2017-10-13 13:12:27 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2017-10-13 13:15:02 +0000 |
| commit | c8e07171b9af74092235a45ccc1cd81b98c764fc (patch) | |
| tree | b5f9ec4ece98546e628a4dfaa32f0f08fecbbe3b /share/scripts | |
| parent | Releasing debian version 20170726-1. (diff) | |
| download | open-infrastructure-compute-tools-c8e07171b9af74092235a45ccc1cd81b98c764fc.tar.xz open-infrastructure-compute-tools-c8e07171b9af74092235a45ccc1cd81b98c764fc.zip | |
Merging upstream version 20171013.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'share/scripts')
| -rwxr-xr-x | share/scripts/debconf | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/share/scripts/debconf b/share/scripts/debconf index 0b80353..19e6e65 100755 --- a/share/scripts/debconf +++ b/share/scripts/debconf @@ -248,6 +248,7 @@ Debootstrap () { DIRECTORY="${1}" + EXCLUDE="ifupdown" INCLUDE="dbus" if echo "${MIRROR}" | grep -qs '^https' || \ @@ -257,8 +258,8 @@ Debootstrap () fi mkdir -p "$(dirname ${DIRECTORY})" - debootstrap --verbose --arch=${ARCHITECTURE} --components=${PARENT_ARCHIVE_AREAS} --include=${INCLUDE} \ - ${PARENT_DISTRIBUTION} "${DIRECTORY}" ${PARENT_MIRROR} + debootstrap --verbose --arch=${ARCHITECTURE} --components=${PARENT_ARCHIVE_AREAS} \ + --exclude=${EXCLUDE} --include=${INCLUDE} ${PARENT_DISTRIBUTION} "${DIRECTORY}" ${PARENT_MIRROR} } Configure_apt () @@ -803,11 +804,6 @@ Configure_systemd_networkd () DIRECTORY="${1}" # Enable systemd-networkd - chroot "${DIRECTORY}" apt purge --yes ifupdown || true - - rm -f "${DIRECTORY}/etc/network/interfaces" - rmdir --ignore-fail-on-non-empty --parents "${DIRECTORY}"/etc/network/* > /dev/null 2>&1 || true - chroot "${DIRECTORY}" systemctl enable systemd-networkd for NUMBER in $(seq 1 ${NETWORK_NUMBER}) |