Mirror/frr
0
0
Fork 1
mirror of https://github.com/FRRouting/frr.git synced 2025-04-30 05:27:16 +02:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

tools: watchfrr should ignore frr_global_options

Browse source 
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>
This commit is contained in:
Donald Sharp 2025-02-13 11:41:27 -05:00
parent fbff0436d3
commit 9101bff6d2
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tools/frrcommon.sh.in
View file

@ -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"