summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2017-10-13 13:12:27 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2017-10-13 13:15:02 +0000
commitc8e07171b9af74092235a45ccc1cd81b98c764fc (patch)
treeb5f9ec4ece98546e628a4dfaa32f0f08fecbbe3b /share
parentReleasing debian version 20170726-1. (diff)
downloadopen-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 '')
-rw-r--r--share/doc/HOST-SETUP.txt12
-rw-r--r--share/man/container-tools.7.txt2
-rwxr-xr-xshare/scripts/debconf10
3 files changed, 10 insertions, 14 deletions
diff --git a/share/doc/HOST-SETUP.txt b/share/doc/HOST-SETUP.txt
index e172ee3..ca043c5 100644
--- a/share/doc/HOST-SETUP.txt
+++ b/share/doc/HOST-SETUP.txt
@@ -82,8 +82,8 @@ iface bridge0 inet static
gateway 10.0.0.1
netmask 255.255.255.0
- pre-up ifconfig eno1 down
- pre-up ifconfig eno1 up
+ pre-up ip link set eno1 down
+ pre-up ip link set eno1 up
bridge_ports eno1
bridge_fd 0
@@ -111,8 +111,8 @@ iface bridge0 inet static
address 10.0.0.1
netmask 255.255.255.0
- pre-up brctl addbr bridge0
- post-down brctl delbr bridge0
+ pre-up ip link add name bridge0 type bridge
+ post-down ip link delete bridge0 type bridge
bridge_fd 0
bridge_maxwait 0
@@ -140,8 +140,8 @@ iface eno3 inet manual
allow-hotplug bond0
iface bond0 inet manual
- up ifconfig bond0 0.0.0.0 up
- down ifconfig bond0 down
+ up ip link set bond0 0.0.0.0 up
+ down ip link set bond0 down
slaves eno2 eno3
diff --git a/share/man/container-tools.7.txt b/share/man/container-tools.7.txt
index 9f9aba4..86266eb 100644
--- a/share/man/container-tools.7.txt
+++ b/share/man/container-tools.7.txt
@@ -48,7 +48,7 @@ INSTALLATION
SOURCE
~~~~~~
- 1. sudo apt install asciidoc git docbook-xml docbook-xsl libxml2-utils make xsltproc dbus systemd-container net-tools
+ 1. sudo apt install asciidoc git docbook-xml docbook-xsl libxml2-utils make xsltproc dbus systemd-container
2. git clone https://sources.open-infrastructure.net/software/container-tools
3. cd container-tools && sudo make install
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})