watchcat: fix broken ping invocation for no-address-family configuration

Fix for issue #19010

Signed-off-by: John Kohl <jtk.git@bostonpog.org>
Signed-off-by: Michal Kowalski <18610805+kofec@users.noreply.github.com>
(cherry picked from commit 406adc536325d955cbccfacb2a2986ea6643ff0b)

diff --git a/utils/watchcat/Makefile b/utils/watchcat/Makefile
index 8bdf864a43385c0de914945d89ec0b9392fd18ed..8140edfe00f3a0d227e64f7beb28979a9497b9ee 100644 (file)
--- a/utils/watchcat/Makefile
+++ b/utils/watchcat/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=watchcat
 PKG_VERSION:=1
-PKG_RELEASE:=16
+PKG_RELEASE:=17
 
 PKG_MAINTAINER:=Roger D <rogerdammit@gmail.com>
 PKG_LICENSE:=GPL-2.0

diff --git a/utils/watchcat/files/watchcat.sh b/utils/watchcat/files/watchcat.sh
index dd0e9b27fc8e209ea677ff5170838098d8dd01f2..0f300a4a44157bfa1b940afa2ab1eeea385ede9e 100644 (file)
--- a/utils/watchcat/files/watchcat.sh
+++ b/utils/watchcat/files/watchcat.sh
@@ -137,12 +137,12 @@ watchcat_monitor_network() {
                for host in $ping_hosts; do
                        if [ "$iface" != "" ]; then
                                ping_result="$(
-                                       ping "$ping_family" -I "$iface" -s "$ping_size" -c 1 "$host" &> /dev/null
+                                       ping $ping_family -I "$iface" -s "$ping_size" -c 1 "$host" &> /dev/null
                                        echo $?
                                )"
                        else
                                ping_result="$(
-                                       ping "$ping_family" -s "$ping_size" -c 1 "$host" &> /dev/null
+                                       ping $ping_family -s "$ping_size" -c 1 "$host" &> /dev/null
                                        echo $?
                                )"
                        fi
@@ -218,12 +218,12 @@ watchcat_ping() {
                for host in $ping_hosts; do
                        if [ "$iface" != "" ]; then
                                ping_result="$(
-                                       ping "$ping_family" -I "$iface" -s "$ping_size" -c 1 "$host" &> /dev/null
+                                       ping $ping_family -I "$iface" -s "$ping_size" -c 1 "$host" &> /dev/null
                                        echo $?
                                )"
                        else
                                ping_result="$(
-                                       ping "$ping_family" -s "$ping_size" -c 1 "$host" &> /dev/null
+                                       ping $ping_family -s "$ping_size" -c 1 "$host" &> /dev/null
                                        echo $?
                                )"
                        fi