Merge pull request #11315 from gromit1811/fix_init_stop_msgs

tools: Don't complain about missing PID files when stopping all damons
This commit is contained in:
Donatas Abraitis 2022-06-01 11:24:13 +03:00 committed by GitHub
commit 134890bf13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -194,10 +194,14 @@ daemon_stop() {
is_user_root || exit 1
all=false
[ "$1" = "--all" ] && { all=true; shift; }
pidfile="$V_PATH/$daemon${inst:+-$inst}.pid"
vtyfile="$V_PATH/$daemon${inst:+-$inst}.vty"
[ -r "$pidfile" ] || fail="pid file not found"
$all && [ -n "$fail" ] && return 0
[ -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"
@ -273,7 +277,7 @@ all_stop() {
done
for dmninst in $reversed; do
daemon_stop "$dmninst" "$1" &
daemon_stop --all "$dmninst" "$1" &
pids="$pids $!"
done
for pid in $pids; do