From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Mon, 24 Aug 2015 17:50:21 +0000 (-0700)
Subject: Fix watchquagga to watch just one daemon
X-Git-Tag: frr-2.0-rc1~1279
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=c8434f3b350527ddf82a20c7a7a08f1bc34966c2;p=matthieu%2Ffrr.git

Fix watchquagga to watch just one daemon

Ticket: CM-6669
Reviewed by: CCR-3249
Testing: See Bug

I believe in the past it made no sense to have only 1 quagga daemon running(zebra),
since it would just handle interface configuration and static routes, both of which
would be better handled through the linux cli.

Now that we have added recursive static routes and the ability to handle static
mpls labels to zebra, there are use cases where zebra would be the only be running.

This change allows watchquagga to behave with this setup.
---

diff --git a/watchquagga/watchquagga.c b/watchquagga/watchquagga.c
index 1e930f4018..0cc2b46a35 100644
--- a/watchquagga/watchquagga.c
+++ b/watchquagga/watchquagga.c
@@ -1324,12 +1324,6 @@ main(int argc, char **argv)
 	      mode_str[gs.mode],special);
       return usage(progname,1);
     }
-  if (gs.special && (gs.numdaemons < 2))
-    {
-      fprintf(stderr,"Mode [%s] does not make sense with only 1 daemon "
-		     "to watch.\n",mode_str[gs.mode]);
-      return usage(progname,1);
-    }
 
   zlog_default = openzlog(progname, ZLOG_NONE, 0,
 			  LOG_CONS|LOG_NDELAY|LOG_PID, LOG_DAEMON);