diff options
| author | Donald Sharp <sharpd@nvidia.com> | 2025-02-13 11:41:27 -0500 |
|---|---|---|
| committer | Donald Sharp <sharpd@nvidia.com> | 2025-02-13 11:41:27 -0500 |
| commit | 9101bff6d21323894ae49ca396b777da098a6556 (patch) | |
| tree | e669f6b1601eb8b487c505c54c1616faace6640e | |
| parent | fbff0436d337cf525abe33c389ac36939cf5afdd (diff) | |
tools: watchfrr should ignore frr_global_options
watchfrr is currently being started with $frr_global_options
This is problematic as that it has a entirely different cli
than the rest of the daemons and we have no plans to make
this equivalent.
Fixes: #18107
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
| -rwxr-xr-x | tools/frrcommon.sh.in | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/frrcommon.sh.in b/tools/frrcommon.sh.in index 44d41956b3..44355f8895 100755 --- a/tools/frrcommon.sh.in +++ b/tools/frrcommon.sh.in @@ -175,7 +175,12 @@ daemon_start() { instopt="${inst:+-n $inst}" eval args="\$${daemon}_options" - cmd="$all_wrap $wrap $bin $nsopt -d $frr_global_options $instopt $args" + if [ "$daemon" = "watchfrr" ]; then + cmd="$all_wrap $wrap $bin $nsopt -d $instopt $args" + else + cmd="$all_wrap $wrap $bin $nsopt -d $frr_global_options $instopt $args" + fi + log_success_msg "Starting $daemon with command: '$cmd'" if eval "$cmd"; then log_success_msg "Started $dmninst" |