Drop dependency on bridge-utils

diff --git a/README.testsuite b/README.testsuite
index 8fc8101b8a2c537c982e8e9c91deb1ee54abdff6..de6c7b8c7d0a34dc8950e62316f730d2ede2dcfc 100644 (file)
--- a/README.testsuite
+++ b/README.testsuite
@@ -1,6 +1,5 @@
 For the testsuite to work, you will have to install at least the following software packages:
 dash \
-bridge-utils \
 asciidoc \
 mdadm \
 lvm2 \

diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
index 655ce93e5dcee334229c2d711651f2c09966d045..30a4d872b4ac413f42cfbb3161dadd359bbc1229 100755 (executable)
--- a/modules.d/40network/ifup.sh
+++ b/modules.d/40network/ifup.sh
@@ -185,11 +185,11 @@ if [ -z "$NO_BRIDGE_MASTER" ]; then
             NO_BRIDGE_MASTER=yes NO_AUTO_DHCP=yes ifup $ethname
             linkup $ethname
             if [ ! -e /tmp/bridge.$bridgename.up ]; then
-                brctl addbr $bridgename
-                brctl setfd $bridgename 0
+                ip link add name $bridgename type bridge
+                echo 0 > /sys/devices/virtual/net/$bridgename/bridge/forward_delay
                 > /tmp/bridge.$bridgename.up
             fi
-            brctl addif $bridgename $ethname
+            ip link set dev $ethname master $bridgename
             ifup $bridgename
             exit 0
         done

diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
index 4a10cf33ba68b454a76a516d8e687eaf97818f4d..6730f16e52c2d1d791c3e3ae741351af3af63fd2 100755 (executable)
--- a/modules.d/40network/module-setup.sh
+++ b/modules.d/40network/module-setup.sh
@@ -27,7 +27,6 @@ install() {
     inst_multiple ip dhclient sed awk
     inst_multiple -o arping arping2
     inst_multiple -o ping ping6
-    inst_multiple -o brctl
     inst_multiple -o teamd teamdctl teamnl
     inst_simple /etc/libnl/classid
     inst_script "$moddir/ifup.sh" "/sbin/ifup"