]> TLD Linux GIT Repositories - packages/rc-scripts.git/blob - rc-scripts-net-br.patch
- don't try to assemble arrays if there are some in /proc/mdstat already
[packages/rc-scripts.git] / rc-scripts-net-br.patch
1 diff -ur rc-scripts-0.4.12.orig/lib/ifup-br rc-scripts-0.4.12.fix/lib/ifup-br
2 --- rc-scripts-0.4.12.orig/lib/ifup-br  2014-06-10 06:55:19.000000000 +0000
3 +++ rc-scripts-0.4.12.fix/lib/ifup-br   2014-07-18 15:33:28.455000000 +0000
4 @@ -65,20 +65,19 @@
5  
6  
7  # standard
8 -[ -n "$AGEING" ] && brctl setageing "$AGEING"
9 -[ -n "$GCINT" ] && brctl setgcint "$GCINT"
10 +[ -n "$AGEING" ] && brctl setageing ${DEVICE} "$AGEING"
11  [ -n "$FD" ] && brctl setfd ${DEVICE} "$FD"
12  
13  # spanning tree protocol
14  if is_yes "$SPANNING_TREE"; then
15 -       brctl stp ${DEVICE} yes
16 +       brctl stp ${DEVICE} on
17         [ -n "$BRIDGEPRIO" ] && brctl setbridgeprio ${DEVICE} "$BRIDGEPRIO"
18         [ -n "$HELLO" ] && brctl sethello ${DEVICE} "$HELLO"
19         [ -n "$MAXAGE" ] && brctl setmaxage ${DEVICE} "$MAXAGE"
20         [ -n "$PATHCOST" -a -n "$PATHCOST_PORT" ] && brctl setpathcost ${DEVICE} "$PATHCOST_PORT" "$PATHCOST"
21         [ -n "$PORTPRIO" -a -n "$PORTPRIO_PORT" ] && brctl setportprio ${DEVICE} "$PORTPRIO_PORT" "$PORTPRIO"
22  else
23 -       brctl stp ${DEVICE} no
24 +       brctl stp ${DEVICE} off
25  fi
26  
27  ip link set dev ${DEVICE} multicast ${MULTICAST} ${ARP}