muninlite: Fix fetching data for interfaces with a dash in the name

munin-node passes the original interface name (as extracted from
/proc/net/dev) to if_* and if_err_*. Thus replacing dash with underscore
results in interfaces not being found anymore.

Closes: #1927
Signed-off-by: Martin Blumenstingl <[email protected]>
Signed-off-by: Jonathan McCrohan <[email protected]>

diff --git a/admin/muninlite/Makefile b/admin/muninlite/Makefile
index 4cf700ba946c0b5bdebc436f8b346b74d8b8727d..ef7e11d8d5c94cc65c41b43aaf869b81e9122dc8 100644 (file)
--- a/admin/muninlite/Makefile
+++ b/admin/muninlite/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=muninlite
 PKG_VERSION:=1.0.4
-PKG_RELEASE:=7
+PKG_RELEASE:=8
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)

diff --git a/admin/muninlite/patches/220-modify-ifname-parser.patch b/admin/muninlite/patches/220-modify-ifname-parser.patch
index 95655cfbd8dbaf253f638c62d76637cdad46a826..6a2ba236fe82a747d1b280cac913fcc16d78d07c 100644 (file)
--- a/admin/muninlite/patches/220-modify-ifname-parser.patch
+++ b/admin/muninlite/patches/220-modify-ifname-parser.patch
@@ -5,7 +5,7 @@
  }
  fetch_if() {
 -  IINFO=$(grep "$1:" /proc/net/dev | cut -d: -f2 | sed -e 's/  / /g')
-+  IINFO=$(cat /proc/net/dev | sed -e 's/-/_/g' | grep "$1:" | cut -d: -f2 | sed -e 's/  */ /g' -e 's/^[ \t]*//')
++  IINFO=$(grep "$1:" /proc/net/dev | cut -d: -f2 | sed -e 's/  */ /g' -e 's/^[ \t]*//')
    echo "down.value" $(echo $IINFO | cut -d\  -f1)
    echo "up.value" $(echo $IINFO | cut -d\  -f9)
  }
@@ -16,7 +16,7 @@
  }
  fetch_if_err() {
 -  IINFO=$(grep "$1:" /proc/net/dev | cut -d: -f2 | sed -e 's/  / /g')
-+  IINFO=$(cat /proc/net/dev | sed -e 's/-/_/g' | grep "$1:" | cut -d: -f2 | sed -e 's/  */ /g' -e 's/^[ \t]*//')
++  IINFO=$(grep "$1:" /proc/net/dev | cut -d: -f2 | sed -e 's/  */ /g' -e 's/^[ \t]*//')
    echo "rcvd.value" $(echo $IINFO | cut -d\  -f3)
    echo "trans.value" $(echo $IINFO | cut -d\  -f11)
  }