mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-07 20:34:33 +00:00
Merge pull request #11572 from opensourcerouting/fix/avoid_double_quotes_when_cat
tools: Do not wrap the pidfile into double-quotes for frrcommon.sh
This commit is contained in:
commit
cbf73b0272
@ -208,7 +208,7 @@ daemon_stop() {
|
|||||||
|
|
||||||
[ -r "$pidfile" ] || fail="pid file not found"
|
[ -r "$pidfile" ] || fail="pid file not found"
|
||||||
$all && [ -n "$fail" ] && return 0
|
$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"
|
[ -z "$fail" -a -z "$pid" ] && fail="pid file is empty"
|
||||||
[ -n "$fail" ] || kill -0 "$pid" 2>/dev/null || fail="pid $pid not running"
|
[ -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"
|
pidfile="$V_PATH/$daemon${inst:+-$inst}.pid"
|
||||||
|
|
||||||
[ -r "$pidfile" ] || return 3
|
[ -r "$pidfile" ] || return 3
|
||||||
pid="$(cat \"$pidfile\")"
|
pid="$(cat "$pidfile")"
|
||||||
[ -z "$pid" ] && return 1
|
[ -z "$pid" ] && return 1
|
||||||
kill -0 "$pid" 2>/dev/null || return 1
|
kill -0 "$pid" 2>/dev/null || return 1
|
||||||
return 0
|
return 0
|
||||||
|
Loading…
Reference in New Issue
Block a user