From: sharpd <sharpd@cumulusnetworks.com>
Date: Sat, 13 Feb 2016 12:26:10 +0000 (-0800)
Subject: debian: Fix up some issues Dave pointed out and Fix Multi-Instance OSPF
X-Git-Tag: frr-2.0-rc1~1125
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=86894a2eb15b18ba9ca4e8875badc74f64960a30;p=mirror%2Ffrr.git

debian: Fix up some issues Dave pointed out and Fix Multi-Instance OSPF

Address some start/stop issues that Dave has pointed out, in addition add
the ability to work with multi-instance ospf.

Ticket: CM-9298
Reviewed-by: Dave Olson
Testing: By hand and passed to Atul for further testing
---

diff --git a/debian/bgpd.service b/debian/bgpd.service
index 6772787549..c7dc9418f3 100644
--- a/debian/bgpd.service
+++ b/debian/bgpd.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Cumulus Linux Quagga BGP Daemon
 After=syslog.target networking.service zebra.service
+Requires=zebra.service
 OnFailure=heartbeat-failed@%n.service
 
 [Service]
@@ -12,6 +13,7 @@ StartLimitBurst=3
 TimeoutSec=1m
 WatchdogSec=60s
 RestartSec=5
+Restart=on-abnormal
 LimitNOFILE=1024
 ExecStart=/usr/lib/quagga/bgpd $BGPD_OPTIONS
 ExecStartPost=/usr/bin/vtysh -b -n
diff --git a/debian/isisd.service b/debian/isisd.service
index 04b128a8e2..ba2ca68212 100644
--- a/debian/isisd.service
+++ b/debian/isisd.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=IS-IS routing daemon
 After=syslog.target networking.service zebra.service
+Requires=zebra.service
 OnFailure=heartbeat-failed@%n.service
 
 [Service]
diff --git a/debian/ospf6d.service b/debian/ospf6d.service
index 48b6ddb319..2dee461acf 100644
--- a/debian/ospf6d.service
+++ b/debian/ospf6d.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=OSPF routing daemon for IPv6
 After=syslog.target networking.service zebra.service
+Requires=zebra.service
 OnFailure=heartbeat-failed@%n.service
 
 [Service]
diff --git a/debian/ospfd.service b/debian/ospfd.service
index d4213c8ad7..907d546d76 100644
--- a/debian/ospfd.service
+++ b/debian/ospfd.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=OSPF routing daemon
 After=syslog.target networking.service zebra.service
+Requires=zebra.service
 OnFailure=heartbeat-failed@%n.service
 
 [Service]
@@ -17,4 +18,4 @@ LimitNOFILE=1024
 ExecStart=/usr/lib/quagga/ospfd $OSPFD_OPTIONS
 ExecStartPost=/usr/bin/vtysh -b  -n
 [Install]
-WantedBy=networkonline.target
+WantedBy=network-online.target
diff --git a/debian/ospfd@.service b/debian/ospfd@.service
new file mode 100644
index 0000000000..2cdaea8642
--- /dev/null
+++ b/debian/ospfd@.service
@@ -0,0 +1,21 @@
+[Unit]
+Description=OSPF routing daemon %I
+After=syslog.target networking.service zebra.service
+Requires=zebra.service
+OnFailure=heartbeat-failed@%n.service
+
+[Service]
+Type=notify
+Nice=-5
+EnvironmentFile=/etc/default/quagga
+StartLimitInterval=3m
+StartLimitBurst=3
+TimeoutSec=1m
+WatchdogSec=60s
+RestartSec=5
+Restart=on-abnormal
+LimitNOFILE=1024
+ExecStart=/usr/lib/quagga/ospfd $OSPFD_OPTIONS -n %I
+ExecStartPost=/usr/bin/vtysh -b  -n
+[Install]
+WantedBy=network-online.target
diff --git a/debian/ripd.service b/debian/ripd.service
index 7b131b87be..661b83b5c2 100644
--- a/debian/ripd.service
+++ b/debian/ripd.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=RIP routing daemon
 After=syslog.target networking.service zebra.service
+Requires=zebra.service
 OnFailure=heartbeat-failed@%n.service
 
 [Service]
diff --git a/debian/ripngd.service b/debian/ripngd.service
index 8c98620aef..cd39feeb8d 100644
--- a/debian/ripngd.service
+++ b/debian/ripngd.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=RIP routing daemon for IPv6
 After=syslog.target networking.service zebra.service
+Requires=zebra.service
 OnFailure=heartbeat-failed@%n.service
 
 [Service]