[gentoo-commits] proj/netifrc:master commit in: net/, doc/

[Robin H. Johnson]

commit:     734e527dbe32fc3c0abdd326c485a6e69d8646f2
Author:     Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  7 20:02:59 2015 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Nov  7 20:18:02 2015 +0000
URL:        https://gitweb.gentoo.org/proj/netifrc.git/commit/?id=734e527d

net: bridge: add bridge_ and brport_ prefixes to sysfs interface

keep the no prefix to be backward compatible.

Signed-off-by: Alon Bar-Lev <alonbl <AT> gentoo.org>

 doc/net.example.Linux.in |  6 +++---
 net/bridge.sh            | 29 +++++++++++++++++------------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/doc/net.example.Linux.in b/doc/net.example.Linux.in
index bcf3311..f71385d 100644
--- a/doc/net.example.Linux.in
+++ b/doc/net.example.Linux.in
@@ -919,9 +919,9 @@
 # You can also configure the bridge or bridge members via sysfs on 2.6 kernels
 # or newer. See the kernel bridge documentation for a description of these
 # options.
-#stp_state_br0="0"
-#forward_delay_br0="10"
-#hairpin_mode_eth0="1"
+#bridge_stp_state_br0="0"
+#bridge_forward_delay_br0="10"
+#brport_hairpin_mode_eth0="1"
 
 #-----------------------------------------------------------------------------
 # RFC 2684 Bridge Support

diff --git a/net/bridge.sh b/net/bridge.sh
index 82abb71..407b578 100644
--- a/net/bridge.sh
+++ b/net/bridge.sh
@@ -125,12 +125,15 @@ bridge_pre_start()
        for x in /sys/class/net/"${IFACE}"/bridge/*; do
                [ -f "${x}" ] || continue
                n=${x##*/}
-               eval s=\$${n}_${IFVAR}
-               if [ -n "${s}" ]; then
-                       einfo "Setting ${n}: ${s}"
-                       echo "${s}" >"${x}" || \
-                       eerror "Failed to configure $n (${n}_${IFVAR})"
-               fi
+               # keep no prefix for backward compatibility
+               for prefix in "" bridge_; do
+                       eval s=\$${prefix}${n}_${IFVAR}
+                       if [ -n "${s}" ]; then
+                               einfo "Setting ${n}: ${s}"
+                               echo "${s}" >"${x}" || \
+                               eerror "Failed to configure $n (${n}_${IFVAR})"
+                       fi
+               done
        done
 
        if [ -n "${ports}" ]; then
@@ -161,12 +164,14 @@ bridge_pre_start()
                        for x in /sys/class/net/"${IFACE}"/brport/*; do
                                [ -f "${x}" ] || continue
                                n=${x##*/}
-                               eval s=\$${n}_${IFVAR}
-                               if [ -n "${s}" ]; then
-                                       einfo "Setting ${n}@${IFACE}: ${s}"
-                                       echo "${s}" >"${x}" || \
-                                       eerror "Failed to configure $n 
(${n}_${IFVAR})"
-                               fi
+                               for prefix in "" brport_; do
+                                       eval s=\$${prefix}${n}_${IFVAR}
+                                       if [ -n "${s}" ]; then
+                                               einfo "Setting ${n}@${IFACE}: 
${s}"
+                                               echo "${s}" >"${x}" || \
+                                               eerror "Failed to configure $n 
(${n}_${IFVAR})"
+                                       fi
+                               done
                        done
                        eend 0
                done