proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-04-28 21:20:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "tools: stop zebra daemon last"

Browse Source 
This reverts commit 2000ac4075.

There were concerns that ensuring zebra stopped last led to
problems with zebra's "-r" flag, so we'll revert that for the
time being and reconsider this area.

Signed-off-by: Mark Stapp <mjs@labn.net>
This commit is contained in:
Mark Stapp 2022-12-06 11:21:02 -05:00
parent 5eb310087b
commit 828ac45474
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/frrcommon.sh.in
View File

@ -266,7 +266,7 @@ all_start() {
} }
all_stop() { all_stop() {
local pids reversed need_zebra local pids reversed
daemon_list enabled_daemons disabled_daemons daemon_list enabled_daemons disabled_daemons
[ "$1" = "--reallyall" ] && enabled_daemons="$enabled_daemons $disabled_daemons" [ "$1" = "--reallyall" ] && enabled_daemons="$enabled_daemons $disabled_daemons"
@ -276,23 +276,13 @@ all_stop() {
reversed="$dmninst $reversed" reversed="$dmninst $reversed"
done done
# Stop zebra last, after trying to stop the other daemons
for dmninst in $reversed; do for dmninst in $reversed; do
if [ "$dmninst" = "zebra" ]; then
need_zebra="yes"
continue
fi
daemon_stop "$dmninst" "$1" & daemon_stop "$dmninst" "$1" &
pids="$pids $!" pids="$pids $!"
done done
for pid in $pids; do for pid in $pids; do
wait $pid wait $pid
done done
if [ -n "$need_zebra" ]; then
daemon_stop "zebra"
fi
} }
all_status() { all_status() {