|
 |
adad6c |
From ba25b54c7eaa65c53cc81df1d0ee8c1439e501a8 Mon Sep 17 00:00:00 2001
|
|
|
adad6c |
From: Daniel Molkentin <dmolkentin@suse.com>
|
|
|
adad6c |
Date: Tue, 14 Feb 2017 12:51:18 +0100
|
|
|
adad6c |
Subject: [PATCH] Drop dependency on bridge-utils
|
|
|
adad6c |
|
|
|
adad6c |
---
|
|
|
adad6c |
README.testsuite | 1 -
|
|
|
adad6c |
modules.d/40network/ifup.sh | 6 +++---
|
|
|
adad6c |
modules.d/40network/module-setup.sh | 1 -
|
|
|
adad6c |
3 files changed, 3 insertions(+), 5 deletions(-)
|
|
|
adad6c |
|
|
|
adad6c |
diff --git a/README.testsuite b/README.testsuite
|
|
|
adad6c |
index 247ed3aa..fc2ee209 100644
|
|
|
adad6c |
--- a/README.testsuite
|
|
|
adad6c |
+++ b/README.testsuite
|
|
|
adad6c |
@@ -1,6 +1,5 @@
|
|
|
adad6c |
For the testsuite to work, you will have to install at least the following software packages:
|
|
|
adad6c |
dash \
|
|
|
adad6c |
-bridge-utils \
|
|
|
adad6c |
asciidoc \
|
|
|
adad6c |
mdadm \
|
|
|
adad6c |
lvm2 \
|
|
|
adad6c |
diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
|
|
|
adad6c |
index 181ab67c..47ec2df6 100755
|
|
|
adad6c |
--- a/modules.d/40network/ifup.sh
|
|
|
adad6c |
+++ b/modules.d/40network/ifup.sh
|
|
|
adad6c |
@@ -187,11 +187,11 @@ if [ -z "$NO_BRIDGE_MASTER" ]; then
|
|
|
adad6c |
NO_BRIDGE_MASTER=yes NO_AUTO_DHCP=yes ifup $ethname
|
|
|
adad6c |
linkup $ethname
|
|
|
adad6c |
if [ ! -e /tmp/bridge.$bridgename.up ]; then
|
|
|
adad6c |
- brctl addbr $bridgename
|
|
|
adad6c |
- brctl setfd $bridgename 0
|
|
|
adad6c |
+ ip link add name $bridgename type bridge
|
|
|
adad6c |
+ echo 0 > /sys/devices/virtual/net/$bridgename/bridge/forward_delay
|
|
|
adad6c |
> /tmp/bridge.$bridgename.up
|
|
|
adad6c |
fi
|
|
|
adad6c |
- brctl addif $bridgename $ethname
|
|
|
adad6c |
+ ip link set dev $ethname master $bridgename
|
|
|
adad6c |
ifup $bridgename
|
|
|
adad6c |
exit 0
|
|
|
adad6c |
done
|
|
|
adad6c |
diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
|
|
|
adad6c |
index de353674..4ead92fa 100755
|
|
|
adad6c |
--- a/modules.d/40network/module-setup.sh
|
|
|
adad6c |
+++ b/modules.d/40network/module-setup.sh
|
|
|
adad6c |
@@ -71,7 +71,6 @@ install() {
|
|
|
adad6c |
local _arch _i _dir
|
|
|
adad6c |
inst_multiple ip arping dhclient sed awk
|
|
|
adad6c |
inst_multiple -o ping ping6
|
|
|
adad6c |
- inst_multiple -o brctl
|
|
|
adad6c |
inst_multiple -o teamd teamdctl teamnl
|
|
|
adad6c |
inst_simple /etc/libnl/classid
|
|
|
adad6c |
inst_script "$moddir/ifup.sh" "/sbin/ifup"
|