commit 4f8fea4e2288c7c5507ef06a6dbd4819efc56cf9 parent 8c6a2df87a59a06d254f311eb17b2a1a6f0401e0 Author: Jonathan McCrohan <jmccrohan@gmail.com> Date: Thu, 12 Feb 2015 00:31:09 +0000 muninlite: revert "correctly parse ifname with - char" This reverts commit edcad492e115e012366b41350e9cd3032bda832e. Patch is broken and breaking build; reverting until I have time to investigate. Reopens #701 Closes #889 Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com> Diffstat:
| D | admin/muninlite/patches/220-modify-ifname-parser.patch | | | 20 | -------------------- |
1 file changed, 0 insertions(+), 20 deletions(-)
diff --git a/admin/muninlite/patches/220-modify-ifname-parser.patch b/admin/muninlite/patches/220-modify-ifname-parser.patch @@ -1,20 +0,0 @@ ---- a/munin-node.in -+++ b/munin-node.in -@@ -141,7 +141,7 @@ - fi - } - fetch_if() { -- IINFO=$(grep "$1:" /proc/net/dev | cut -d: -f2 | sed -e 's/ / /g') -+ IINFO=$(sed -ne "/^ *${1//_/-}: / { s/^.\+: \+//; s/[[:space:]]\+/ /gp }" /proc/net/dev) - echo "down.value" $(echo $IINFO | cut -d\ -f1) - echo "up.value" $(echo $IINFO | cut -d\ -f9) - } -@@ -162,7 +162,7 @@ - echo "trans.warning 1" - } - fetch_if_err() { -- IINFO=$(grep "$1:" /proc/net/dev | cut -d: -f2 | sed -e 's/ / /g') -+ IINFO=$(sed -ne "/^ *${1//_/-}: / { s/^.\+: \+//; s/[[:space:]]\+/ /gp }" /proc/net/dev) - echo "rcvd.value" $(echo $IINFO | cut -d\ -f3) - echo "trans.value" $(echo $IINFO | cut -d\ -f11) - }