summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@nvidia.com>2022-03-29 23:47:48 +0200
committerDonald Sharp <sharpd@nvidia.com>2022-03-30 13:44:31 +0200
commit1686b1d4864384ee508b58418f20970f2dff2587 (patch)
tree87f1191ded6a917bbbf8a074e3fb866b8c53d87f /tools
parentMerge pull request #10838 from ton31337/feature/bgpd_callbacks_for_start_end_... (diff)
downloadfrr-1686b1d4864384ee508b58418f20970f2dff2587.tar.xz
frr-1686b1d4864384ee508b58418f20970f2dff2587.zip
tools: Modify all_stop to actually try to stop all daemons
If a user enters: /usr/lib/frr/frrinit.sh start <modifies daemons file to remove a daemon from being used> then calls: /usr/lib/frr/frrinit.sh stop The daemon(s) that are removed from the file are not stopped. Apparently in shell scripting naming the variables the same as the callee does not work as one would think. Just renaming the variable to something else solved the problem. Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/frrcommon.sh.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/frrcommon.sh.in b/tools/frrcommon.sh.in
index d95f2d4be..52f5277d2 100644
--- a/tools/frrcommon.sh.in
+++ b/tools/frrcommon.sh.in
@@ -253,11 +253,11 @@ all_start() {
all_stop() {
local pids reversed
- daemon_list daemons disabled
- [ "$1" = "--reallyall" ] && daemons="$daemons $disabled"
+ daemon_list enabled_daemons disabled_daemons
+ [ "$1" = "--reallyall" ] && enabled_daemons="$enabled_daemons $disabled_daemons"
reversed=""
- for dmninst in $daemons; do
+ for dmninst in $enabled_daemons; do
reversed="$dmninst $reversed"
done