From bca11d706fe34d8742a84c2df8b37a0ff5e93505 Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Sat, 7 Nov 2015 18:11:58 +0100 Subject: [PATCH] muninlite: Fix parsing the available network interface names Signed-off-by: Martin Blumenstingl Signed-off-by: Jonathan McCrohan --- .../230-fix-available-interface-parsing.patch | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 admin/muninlite/patches/230-fix-available-interface-parsing.patch diff --git a/admin/muninlite/patches/230-fix-available-interface-parsing.patch b/admin/muninlite/patches/230-fix-available-interface-parsing.patch new file mode 100644 index 000000000..1e3066bff --- /dev/null +++ b/admin/muninlite/patches/230-fix-available-interface-parsing.patch @@ -0,0 +1,20 @@ +--- a/munin-node.in 2015-11-07 17:52:54.000000000 +0100 ++++ b/munin-node.in 2015-11-07 18:09:06.117200499 +0100 +@@ -72,7 +72,7 @@ + for PLUG in $PLUGINS + do + if [ "$PLUG" = "if_" ]; then +- 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 -E '^ *(ppp|eth|wlan|ath|ra|ipsec|tap|br-)[^:]{1,}:' /proc/net/dev | cut -f1 -d: | sed 's/ //g'); + do + INTERRES=$(echo $INTER | sed -e 's/\./VLAN/' -e 's/\-/_/') + RES="$RES if_$INTERRES" +@@ -80,7 +80,7 @@ + eval "config_if_${INTERRES}() { config_if $INTER $@; };" + done + elif [ "$PLUG" = "if_err_" ]; then +- 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 -E '^ *(ppp|eth|wlan|ath|ra|ipsec|tap|br-)[^:]{1,}:' /proc/net/dev | cut -f1 -d: | sed 's/ //g'); + do + INTERRES=$(echo $INTER | sed -e 's/\./VLAN/' -e 's/\-/_/') + RES="$RES if_err_$INTERRES"