From 9101bff6d21323894ae49ca396b777da098a6556 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Thu, 13 Feb 2025 11:41:27 -0500 Subject: [PATCH] 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 --- tools/frrcommon.sh.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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"