Plugins tc_*: check existence of "tc" during autoconf

munin-monitoring · Sep 18, 2018 · 6995742 · 6995742
1 parent 272220c
commit 6995742
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/plugins/network/tc_ b/plugins/network/tc_
@@ -50,10 +50,12 @@ mytc() {
 
 case "$1" in
     autoconf)
-	if [ -r /proc/net/dev ]; then
-	    echo yes
-	else
+	if [ ! -r /proc/net/dev ]; then
 	    echo "no (/proc/net/dev not found)"
+	elif [ ! -x /sbin/tc ]; then
+	    echo "no (missing 'tc' executable)"
+	else
+	    echo yes
 	fi
 	exit 0
 	;;

diff --git a/plugins/network/tc_drops_ b/plugins/network/tc_drops_
@@ -21,10 +21,12 @@ mytc() {
 
 case $1 in
     autoconf)
-	if [ -r /proc/net/dev ]; then
-	    echo yes
-	else
+	if [ ! -r /proc/net/dev ]; then
 	    echo "no (/proc/net/dev not found)"
+	elif ! which tc >/dev/null; then
+	    echo "no (missing 'tc' executable)"
+	else
+	    echo yes
 	fi
 	exit 0
 	;;

diff --git a/plugins/network/tc_packets_ b/plugins/network/tc_packets_
@@ -21,10 +21,12 @@ mytc() {
 
 case $1 in
     autoconf)
-	if [ -r /proc/net/dev ]; then
-	    echo yes
-	else
+	if [ ! -r /proc/net/dev ]; then
 	    echo "no (/proc/net/dev not found)"
+	elif ! which tc >/dev/null; then
+	    echo "no (missing 'tc' executable)"
+	else
+	    echo yes
 	fi
 	exit 0
 	;;