Drop dependency on bridge-utils

This commit is contained in:
Daniel Molkentin 2017-02-14 12:51:18 +01:00
parent fd79054610
commit 285495814b
3 changed files with 3 additions and 5 deletions

View File

@ -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 \

View File

@ -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

View File

@ -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"