From 9dedc9eb37688fe420a382ff385243b6711080c6 Mon Sep 17 00:00:00 2001 From: Donatas Abraitis Date: Fri, 8 Jul 2022 19:11:17 +0300 Subject: tools: Do not wrap the pidfile into double-quotes for frrcommon.sh The problem is that when we run watchfrr.sh/frrinit.sh, we get something like: ``` cat: '"/var/run/frr/staticd.pid"': No such file or directory cat: '"/var/run/frr/babeld.pid"': No such file or directory cat: '"/var/run/frr/zebra.pid"': No such file or directory ``` Signed-off-by: Donatas Abraitis --- tools/frrcommon.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/frrcommon.sh.in b/tools/frrcommon.sh.in index 3344ff495..6eb3223fa 100755 --- a/tools/frrcommon.sh.in +++ b/tools/frrcommon.sh.in @@ -208,7 +208,7 @@ daemon_stop() { [ -r "$pidfile" ] || fail="pid file not found" $all && [ -n "$fail" ] && return 0 - [ -z "$fail" ] && pid="$(cat \"$pidfile\")" + [ -z "$fail" ] && pid="$(cat "$pidfile")" [ -z "$fail" -a -z "$pid" ] && fail="pid file is empty" [ -n "$fail" ] || kill -0 "$pid" 2>/dev/null || fail="pid $pid not running" @@ -242,7 +242,7 @@ daemon_status() { pidfile="$V_PATH/$daemon${inst:+-$inst}.pid" [ -r "$pidfile" ] || return 3 - pid="$(cat \"$pidfile\")" + pid="$(cat "$pidfile")" [ -z "$pid" ] && return 1 kill -0 "$pid" 2>/dev/null || return 1 return 0 -- cgit v1.2.3