Skip to content

Commit

Permalink
tools: watchfrr should ignore frr_global_options
Browse files Browse the repository at this point in the history
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: FRRouting#18107

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
  • Loading branch information
donaldsharp committed Feb 13, 2025
1 parent fbff043 commit 9101bff
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion tools/frrcommon.sh.in
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 9101bff

Please sign in to comment.