summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@open-infrastructure.net>2017-10-06 14:54:06 +0000
committerDaniel Baumann <daniel.baumann@open-infrastructure.net>2017-10-13 12:58:03 +0000
commite83f117553d3e357f18e454e2af9d2c337946858 (patch)
treeb76ed4a5bd180233054bc09eaff4169019593e13
parentRemoving some dead code in network-veth-extra handling. (diff)
downloadcompute-tools-e83f117553d3e357f18e454e2af9d2c337946858.tar.xz
compute-tools-e83f117553d3e357f18e454e2af9d2c337946858.zip
Removing ifupdown in debconf container create script earlier by excluding it from debootstrap.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
-rwxr-xr-xshare/scripts/debconf10
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})