[packages] admin: muninlite: Corrected patch for bridge / dash in interface name patch. It had extraneous +'s from copying from a patch
[openwrt.org/packages.git] / admin / muninlite / patches / 210-add-bridge-devs.patch
blob:a/admin/muninlite/patches/210-add-bridge-devs.patch -> blob:b/admin/muninlite/patches/210-add-bridge-devs.patch
--- a/munin-node.in --- a/munin-node.in
+++ b/munin-node.in +++ b/munin-node.in
@@ -72,7 +72,8 @@ RES="" @@ -72,17 +72,17 @@ RES=""
for PLUG in $PLUGINS for PLUG in $PLUGINS
do do
if [ "$PLUG" = "if_" ]; then if [ "$PLUG" = "if_" ]; then
- for INTER in $(grep '^ *\(ppp\|eth\|wlan\|ath\|ra\|ipsec\|tap\)\([^:]\)\{1,\}:' /proc/net/dev | cut -f1 -d: | sed 's/ //g'); - for INTER in $(grep '^ *\(ppp\|eth\|wlan\|ath\|ra\|ipsec\|tap\)\([^:]\)\{1,\}:' /proc/net/dev | cut -f1 -d: | sed 's/ //g');
+ for INTER in $(grep '^ *\(ppp\|eth\|wlan\|ath\|ra\|ipsec\|tap\|br-\)\([^:]\)\{1,\}:' /proc/net/dev | cut -f1 -d: | sed 's/ //g + for INTER in $(grep '^ *\(ppp\|eth\|wlan\|ath\|ra\|ipsec\|tap\|br-\)\([^:]\)\{1,\}:' /proc/net/dev | cut -f1 -d: | sed 's/ //g');
+s/\-/_/g');  
do do
INTERRES=$(echo $INTER | sed 's/\./VLAN/') - INTERRES=$(echo $INTER | sed 's/\./VLAN/')
  + INTERRES=$(echo $INTER | sed -e 's/\./VLAN/' -e 's/\-/_/')
RES="$RES if_$INTERRES" RES="$RES if_$INTERRES"
@@ -80,7 +81,8 @@ do eval "fetch_if_${INTERRES}() { fetch_if $INTER $@; };"
eval "config_if_${INTERRES}() { config_if $INTER $@; };" eval "config_if_${INTERRES}() { config_if $INTER $@; };"
done done
elif [ "$PLUG" = "if_err_" ]; then elif [ "$PLUG" = "if_err_" ]; then
- for INTER in $(grep '^ *\(ppp\|eth\|wlan\|ath\|ra\|ipsec\|tap\)\([^:]\)\{1,\}:' /proc/net/dev | cut -f1 -d: | sed 's/ //g'); - for INTER in $(grep '^ *\(ppp\|eth\|wlan\|ath\|ra\|ipsec\|tap\)\([^:]\)\{1,\}:' /proc/net/dev | cut -f1 -d: | sed 's/ //g');
+ for INTER in $(grep '^ *\(ppp\|eth\|wlan\|ath\|ra\|ipsec\|tap\|br-\)\([^:]\)\{1,\}:' /proc/net/dev | cut -f1 -d: | sed 's/ //g + for INTER in $(grep '^ *\(ppp\|eth\|wlan\|ath\|ra\|ipsec\|tap\|br-\)\([^:]\)\{1,\}:' /proc/net/dev | cut -f1 -d: | sed 's/ //g');
+s/\-/_/g');  
do do
INTERRES=$(echo $INTER | sed 's/\./VLAN/') - INTERRES=$(echo $INTER | sed 's/\./VLAN/')
  + INTERRES=$(echo $INTER | sed -e 's/\./VLAN/' -e 's/\-/_/')
RES="$RES if_err_$INTERRES" RES="$RES if_err_$INTERRES"
  eval "fetch_if_err_${INTERRES}() { fetch_if_err $INTER $@; };"
  eval "config_if_err_${INTERRES}() { config_if_err $INTER $@; };"
   
comments