This patch fix a bug while getting data for interfaces like br-lan, pppoa-wan.
Signed-off-by: Luca Dariz <[email protected]> --- Index: admin/muninlite/patches/210-add-bridge-devs.patch =================================================================== --- admin/muninlite/patches/210-add-bridge-devs.patch (revisione 35318) +++ admin/muninlite/patches/210-add-bridge-devs.patch (copia locale) @@ -1,22 +1,24 @@ --- a/munin-node.in +++ b/munin-node.in -@@ -72,7 +72,8 @@ RES="" +@@ -72,17 +72,17 @@ RES="" for PLUG in $PLUGINS do 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\|br-\)\([^:]\)\{1,\}:' /proc/net/dev | cut -f1 -d: | sed 's/ //g -+s/\-/_/g'); ++ for INTER in $(grep '^ *\(ppp\|eth\|wlan\|ath\|ra\|ipsec\|tap\|br-\)\([^:]\)\{1,\}:' /proc/net/dev | cut -f1 -d: | sed 's/ //g'); 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" -@@ -80,7 +81,8 @@ do + eval "fetch_if_${INTERRES}() { fetch_if $INTER $@; };" eval "config_if_${INTERRES}() { config_if $INTER $@; };" done 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\|br-\)\([^:]\)\{1,\}:' /proc/net/dev | cut -f1 -d: | sed 's/ //g -+s/\-/_/g'); ++ for INTER in $(grep '^ *\(ppp\|eth\|wlan\|ath\|ra\|ipsec\|tap\|br-\)\([^:]\)\{1,\}:' /proc/net/dev | cut -f1 -d: | sed 's/ //g'); 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" + eval "fetch_if_err_${INTERRES}() { fetch_if_err $INTER $@; };" + eval "config_if_err_${INTERRES}() { config_if_err $INTER $@; };" _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
