diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-04-25 11:34:35 -0400 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-04-27 16:04:48 -0400 |
| commit | 651415bd617af87ee0addfc15d6985b6946600ed (patch) | |
| tree | 2a3f537c22a68dae1e554f8a4de5be1a1394a9d5 /zebra/main.c | |
| parent | e2dd9485cb35cf81add815959927a3016116d898 (diff) | |
quagga: Fixup startup to allow consistency between sysV and systemd
We want the ability to start up quagga in a varied set of
environments. This needs to be done in SysV and systemd
startups. As such refactor the code to allow us to
allow end users to easily switch between the two
sysV:
edit the /etc/quagga/daemons file
service quagga [start|stop|reload|restart]
Systemd:
edit the /etc/quagga/daemons file
systemctl [start|stop|reload|restart] quagga
Ticket: CM-10634
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Reviewed-by: Daniel Walton <dwalton@cumulusnetworks.com>
Diffstat (limited to 'zebra/main.c')
| -rw-r--r-- | zebra/main.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/zebra/main.c b/zebra/main.c index 65a7dbec1a..fe48735506 100644 --- a/zebra/main.c +++ b/zebra/main.c @@ -33,7 +33,6 @@ #include "privs.h" #include "sigevent.h" #include "vrf.h" -#include "systemd.h" #include "zebra/rib.h" #include "zebra/zserv.h" @@ -192,7 +191,6 @@ sigint (void) zns = zebra_ns_lookup (NS_DEFAULT); zebra_ns_disable (0, (void **)&zns); - systemd_send_stopping(); exit (0); } @@ -401,14 +399,12 @@ main (int argc, char **argv) if (daemon_mode && daemon (0, 0) < 0) { zlog_err("Zebra daemon failed: %s", strerror(errno)); - systemd_send_stopping (); exit (1); } /* Output pid of zebra. */ pid_output (pid_file); - systemd_send_started (zebrad.master); /* After we have successfully acquired the pidfile, we can be sure * about being the only copy of zebra process, which is submitting * changes to the FIB. |