Merge pull request #11326 from gromit1811/fix_init_stop_msgs2

tools: Really fix all daemon shutdown without complaining about PID files
This commit is contained in:
Donatas Abraitis 2022-06-01 15:26:52 +03:00 committed by GitHub
commit f5b2f86ac0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

4
tools/frrcommon.sh.in Normal file → Executable file
View File

@ -195,7 +195,7 @@ daemon_stop() {
is_user_root || exit 1
all=false
[ "$1" = "--all" ] && { all=true; shift; }
[ "$2" = "--reallyall" ] && all=true
pidfile="$V_PATH/$daemon${inst:+-$inst}.pid"
vtyfile="$V_PATH/$daemon${inst:+-$inst}.vty"
@ -277,7 +277,7 @@ all_stop() {
done
for dmninst in $reversed; do
daemon_stop --all "$dmninst" "$1" &
daemon_stop "$dmninst" "$1" &
pids="$pids $!"
done
for pid in $pids; do