From: Marcin Krol <hawk@tld-linux.org>
Date: Tue, 14 Jul 2015 13:32:39 +0000 (+0000)
Subject: - merged fixes for recent brctl
X-Git-Tag: 0.4.14~3
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=22c356c886ee24fe1928a4ab6617be673e0fffe4;p=rc-scripts.git

- merged fixes for recent brctl
---

diff --git a/lib/ifup-br b/lib/ifup-br
index 4fd7b85..4182b5c 100755
--- a/lib/ifup-br
+++ b/lib/ifup-br
@@ -65,20 +65,19 @@ done
 
 
 # standard
-[ -n "$AGEING" ] && brctl setageing "$AGEING"
-[ -n "$GCINT" ] && brctl setgcint "$GCINT"
+[ -n "$AGEING" ] && brctl setageing ${DEVICE} "$AGEING"
 [ -n "$FD" ] && brctl setfd ${DEVICE} "$FD"
 
 # spanning tree protocol
 if is_yes "$SPANNING_TREE"; then
-	brctl stp ${DEVICE} yes
+	brctl stp ${DEVICE} on
 	[ -n "$BRIDGEPRIO" ] && brctl setbridgeprio ${DEVICE} "$BRIDGEPRIO"
 	[ -n "$HELLO" ] && brctl sethello ${DEVICE} "$HELLO"
 	[ -n "$MAXAGE" ] && brctl setmaxage ${DEVICE} "$MAXAGE"
 	[ -n "$PATHCOST" -a -n "$PATHCOST_PORT" ] && brctl setpathcost ${DEVICE} "$PATHCOST_PORT" "$PATHCOST"
 	[ -n "$PORTPRIO" -a -n "$PORTPRIO_PORT" ] && brctl setportprio ${DEVICE} "$PORTPRIO_PORT" "$PORTPRIO"
 else
-	brctl stp ${DEVICE} no
+	brctl stp ${DEVICE} off
 fi
 
 ip link set dev ${DEVICE} multicast ${MULTICAST} ${ARP}