diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-04-25 17:34:35 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-04-27 22:04:48 +0200 |
| commit | 651415bd617af87ee0addfc15d6985b6946600ed (patch) | |
| tree | 2a3f537c22a68dae1e554f8a4de5be1a1394a9d5 /ospfd | |
| parent | Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga in... (diff) | |
| download | frr-651415bd617af87ee0addfc15d6985b6946600ed.tar.xz frr-651415bd617af87ee0addfc15d6985b6946600ed.zip | |
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 'ospfd')
| -rw-r--r-- | ospfd/ospf_main.c | 2 | ||||
| -rw-r--r-- | ospfd/ospfd.c | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/ospfd/ospf_main.c b/ospfd/ospf_main.c index f86f834b4..758deaf3e 100644 --- a/ospfd/ospf_main.c +++ b/ospfd/ospf_main.c @@ -40,7 +40,6 @@ #include "sigevent.h" #include "zclient.h" #include "vrf.h" -#include "systemd.h" #include "ospfd/ospfd.h" #include "ospfd/ospf_interface.h" @@ -368,7 +367,6 @@ main (int argc, char **argv) /* Process id file create. */ pid_output (pid_file); - systemd_send_started (master); vty_serv_sock (vty_addr, vty_port, vty_path); /* Print banner. */ diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c index d7d22a272..3bb714824 100644 --- a/ospfd/ospfd.c +++ b/ospfd/ospfd.c @@ -34,7 +34,6 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA #include "zclient.h" #include "plist.h" #include "sockopt.h" -#include "systemd.h" #include "ospfd/ospfd.h" #include "ospfd/ospf_network.h" @@ -397,7 +396,6 @@ ospf_deferred_shutdown_finish (struct ospf *ospf) if (CHECK_FLAG (om->options, OSPF_MASTER_SHUTDOWN) && (listcount (om->ospf) == 0)) { - systemd_send_stopping (); exit (0); } @@ -466,7 +464,6 @@ ospf_terminate (void) SET_FLAG (om->options, OSPF_MASTER_SHUTDOWN); - systemd_send_stopping (); /* exit immediately if OSPF not actually running */ if (listcount(om->ospf) == 0) exit(0); |