From: Kevin Darbyshire-Bryant Date: Thu, 7 May 2020 08:43:27 +0000 (+0100) Subject: collectd: sqm_collectd improve interface name filter X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=c8640d1f68321c092542f91adc33f3d21fcecd18;p=feed%2Fpackages.git collectd: sqm_collectd improve interface name filter Increase the range of characters that get substituted by '_' so the shell doesn't complain about illegal variable names. Primarily done to catch '.' and '-' but who knows what funnies will appear in i/f names. It's a shame that busybox ash doesn't understand :alnum: Signed-off-by: Kevin Darbyshire-Bryant --- diff --git a/utils/collectd/Makefile b/utils/collectd/Makefile index 96080f5f02..29aec706f8 100644 --- a/utils/collectd/Makefile +++ b/utils/collectd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=collectd PKG_VERSION:=5.11.0 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://collectd.org/files/ \ diff --git a/utils/collectd/files/exec-scripts/sqm_collectd.sh b/utils/collectd/files/exec-scripts/sqm_collectd.sh index 1fda2cb407..a2927854e2 100755 --- a/utils/collectd/files/exec-scripts/sqm_collectd.sh +++ b/utils/collectd/files/exec-scripts/sqm_collectd.sh @@ -9,7 +9,7 @@ handle_cake() { local ifc ifr tin i ifc="$1" - ifr="${ifc//./_}" + ifr="${ifc//[!0-9A-Za-z]/_}" # Overall json_get_vars bytes packets drops backlog qlen