You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
53 lines
2.0 KiB
53 lines
2.0 KiB
From ba25b54c7eaa65c53cc81df1d0ee8c1439e501a8 Mon Sep 17 00:00:00 2001 |
|
From: Daniel Molkentin <dmolkentin@suse.com> |
|
Date: Tue, 14 Feb 2017 12:51:18 +0100 |
|
Subject: [PATCH] Drop dependency on bridge-utils |
|
|
|
--- |
|
README.testsuite | 1 - |
|
modules.d/40network/ifup.sh | 6 +++--- |
|
modules.d/40network/module-setup.sh | 1 - |
|
3 files changed, 3 insertions(+), 5 deletions(-) |
|
|
|
diff --git a/README.testsuite b/README.testsuite |
|
index 247ed3aa..fc2ee209 100644 |
|
--- 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 181ab67c..47ec2df6 100755 |
|
--- a/modules.d/40network/ifup.sh |
|
+++ b/modules.d/40network/ifup.sh |
|
@@ -187,11 +187,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 de353674..4ead92fa 100755 |
|
--- a/modules.d/40network/module-setup.sh |
|
+++ b/modules.d/40network/module-setup.sh |
|
@@ -71,7 +71,6 @@ install() { |
|
local _arch _i _dir |
|
inst_multiple ip arping dhclient sed awk |
|
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"
|
|
|