From 88323f0f96b81cb22181e88c264b5ca7d3c78918 Mon Sep 17 00:00:00 2001 From: Quentin Young Date: Sun, 5 Dec 2021 23:03:52 -0500 Subject: [PATCH] tools: improve explanation of watchfrr_options The explanation block for watchfrr_options was split into two blocks, one explaining the --netns option and one making a vague statement that the init script provides the list of daemons to start. The former can be merged with the latter and the latter is more useful when stated as a caveat for what you should actually use watchfrr_options for. Signed-off-by: Quentin Young --- tools/etc/frr/daemons | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tools/etc/frr/daemons b/tools/etc/frr/daemons index a27976c137..71b3afdab4 100644 --- a/tools/etc/frr/daemons +++ b/tools/etc/frr/daemons @@ -72,12 +72,15 @@ pathd_options=" -A 127.0.0.1" #MAX_FDS=1024 # The list of daemons to watch is automatically generated by the init script. +# This variable can be used to pass options to watchfrr that will be passed +# prior to the daemon list. +# +# To make watchfrr create/join the specified netns, add the the "--netns" +# option here. It will only have an effect in /etc/frr//daemons, and +# you need to start FRR with "/usr/lib/frr/frrinit.sh start ". +# #watchfrr_options="" -# To make watchfrr create/join the specified netns, use the following option: -#watchfrr_options="--netns" -# This only has an effect in /etc/frr//daemons, and you need to -# start FRR with "/usr/lib/frr/frrinit.sh start ". # For any daemon, you can specify a "wrap" command to start instead of starting # the daemon directly. This will simply be prepended to the daemon invocation. -- 2.39.5