summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@open-infrastructure.net>2017-10-06 10:19:28 +0000
committerDaniel Baumann <daniel.baumann@open-infrastructure.net>2017-10-13 12:58:03 +0000
commit8c1e05273903b5a1a1852c73d5242d3b02f1cc73 (patch)
tree9d21e3bc91a4986ab228521f10d9f70e5d70f202
parentUsing iproute instead of net-tools to setup interfaces. (diff)
downloadcompute-tools-8c1e05273903b5a1a1852c73d5242d3b02f1cc73.tar.xz
compute-tools-8c1e05273903b5a1a1852c73d5242d3b02f1cc73.zip
Using iproute instead of bridge-utils to setup bridges.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
-rwxr-xr-xlib/container/start4
-rw-r--r--share/doc/HOST-SETUP.txt4
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/container/start b/lib/container/start
index e2d94b5..13621ff 100755
--- a/lib/container/start
+++ b/lib/container/start
@@ -348,8 +348,8 @@ cat > "/etc/network/interfaces.d/${INTERFACE}" << EOF
allow-hotplug ${INTERFACE}
iface ${INTERFACE} inet manual
pre-up ip link set ${INTERFACE} up
- post-up brctl addif ${BRIDGE} ${INTERFACE}
- pre-down brctl delif ${BRIDGE} ${INTERFACE}
+ post-up ip link set ${INTERFACE} master ${BRIDGE}
+ pre-down ip link set ${INTERFACE} nomaster
post-down ip link set ${INTERFACE} down
EOF
diff --git a/share/doc/HOST-SETUP.txt b/share/doc/HOST-SETUP.txt
index a571ae7..ca043c5 100644
--- a/share/doc/HOST-SETUP.txt
+++ b/share/doc/HOST-SETUP.txt
@@ -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