tools: don't watch nonexistent daemons

If we try to monitor a nonexisting daemon in watchfrr, it will
(currently) forever wait at startup since the vty connection will never
come up.  Just drop the daemon from the daemon list in such a case.

Signed-off-by: David Lamparter <equinox@diac24.net>

diff --git a/tools/frrcommon.sh.in b/tools/frrcommon.sh.in
index fa2fdc94b2af6973083060e0819eda70e3bd04d5..588aa6d103e10a086c3e1dcedeb63114fb53adf2 100644 (file)
--- a/tools/frrcommon.sh.in
+++ b/tools/frrcommon.sh.in
@@ -85,6 +85,9 @@ daemon_list() {
                eval inst=\$${daemon}_instances
                [ "$daemon" = zebra -o "$daemon" = staticd ] && cfg=yes
                if [ -n "$cfg" -a "$cfg" != "no" -a "$cfg" != "0" ]; then
+                       if ! daemon_prep "$daemon" "$inst"; then
+                               continue
+                       fi
                        debug "$daemon enabled"
                        enabled="$enabled $daemon"
                        if [ -n "$inst" ]; then