Update of /cvsroot/devil-linux/build/config/etc/init.d
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26900
Modified Files:
network
Log Message:
support for bridge interfaces via iproute2
Index: network
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/init.d/network,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- network 4 May 2013 13:29:29 -0000 1.62
+++ network 27 Nov 2016 15:08:04 -0000 1.63
@@ -192,9 +192,10 @@
# bridge
if [ -n "$BR_IF" ] ; then
echo "Configuring bridge $DEVICE "
- brctl addbr $DEVICE
+ ip link add name $DEVICE type bridge
+ ip link set $DEVICE up
for i in $BR_IF ; do
- brctl addif $DEVICE $i
+ ip link set $i master $DEVICE
done
if [ -n "$BRIDGE_OPTS" ]; then
grep '^\s*BRIDGE_OPTS=' ${CONFIG_DIR}/${CONFIG_FILE}$IF | while read line;
@@ -469,9 +470,10 @@
if [ -n "$BR_IF" ] ; then
for i in $BR_IF ; do
echo " removing $i from bridge $DEVICE"
- brctl delif $DEVICE $i
+ ip link set $i nomaster
done
- brctl delbr $DEVICE
+ ip link set $DEVICE down
+ ip link delete $DEVICE type bridge
fi
# tunnel
|
