proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-03 06:59:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tools: Don't complain about missing PID files when stopping all damons

Browse Source 
Since 1686b1d486, we try to stop all daemons,
even those which are not (no longer) enabled in /etc/frr/daemons. But we
shouldn't complain about missing PID files for daemons which have never been
started and just silently ignore those.

Signed-off-by: Martin Buck <mb-tmp-tvguho.pbz@gromit.dyndns.org>
This commit is contained in:
Martin Buck 2022-05-31 14:16:34 +02:00
parent fdf4a4f73c
commit f0cccaa6bf
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/frrcommon.sh.in
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