Browse Source

Drop dependency on bridge-utils

master
Daniel Molkentin 7 years ago
parent
commit
285495814b
  1. 1
      README.testsuite
  2. 6
      modules.d/40network/ifup.sh
  3. 1
      modules.d/40network/module-setup.sh

1
README.testsuite

@ -1,6 +1,5 @@ @@ -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 \

6
modules.d/40network/ifup.sh

@ -185,11 +185,11 @@ if [ -z "$NO_BRIDGE_MASTER" ]; then @@ -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

1
modules.d/40network/module-setup.sh

@ -27,7 +27,6 @@ install() { @@ -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"

Loading…
Cancel
Save