- update brctl commands for current bridge-utils

diff --git a/rc-scripts-net-br.patch b/rc-scripts-net-br.patch
new file mode 100644 (file)
index 0000000..d55d5e7
--- /dev/null
+++ b/rc-scripts-net-br.patch
@@ -0,0 +1,27 @@
+diff -ur rc-scripts-0.4.12.orig/lib/ifup-br rc-scripts-0.4.12.fix/lib/ifup-br
+--- rc-scripts-0.4.12.orig/lib/ifup-br 2014-06-10 06:55:19.000000000 +0000
++++ rc-scripts-0.4.12.fix/lib/ifup-br  2014-07-18 15:33:28.455000000 +0000
+@@ -65,20 +65,19 @@
+ 
+ 
+ # 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}

diff --git a/rc-scripts.spec b/rc-scripts.spec
index ea9c12ea3f79e074bc6dcda5cdf3570e74e038be..b7031d5e2aa2872dbd373f8893e5eeefdc68e048 100644 (file)
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -8,7 +8,7 @@ Summary(pl.UTF-8):      inittab i skrypty startowe z katalogu /etc/rc.d
 Summary(tr.UTF-8):     inittab ve /etc/rc.d dosyaları
 Name:          rc-scripts
 Version:       0.4.12
-Release:       1
+Release:       2
 License:       GPL v2
 Group:         Base
 Source0:       %{name}-%{version}.tar.gz
@@ -21,6 +21,7 @@ Patch101:     %{name}-no_tmpfs_root_fsck.patch
 Patch102:      %{name}-selinuxfs_mount.patch
 Patch103:      %{name}-sh_fixes.patch
 Patch104:      %{name}-net-bond.patch
+Patch105:      %{name}-net-br.patch
 URL:           http://svn.pld-linux.org/trac/svn/wiki/packages/rc-scripts
 BuildRequires: autoconf
 BuildRequires: automake
@@ -117,6 +118,7 @@ programcıklar içerir.
 %patch102 -p1
 %patch103 -p1
 %patch104 -p1
+%patch105 -p1
 
 # hack, currently this results in errno@@GLIBC_PRIVATE symbol in ppp-watch:
 #GLIB_LIBS="-Wl,-static `$PKG_CONFIG --libs --static glib-2.0` -Wl,-Bdynamic"