From: sharpd <sharpd@cumulusnetworks.com>
Date: Fri, 12 Feb 2016 13:11:21 +0000 (-0800)
Subject: debian: Temporary fix to get quagga services running
X-Git-Tag: frr-2.0-rc1~1128
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=391e92cd40f06db93aaf9a74ba597ed53a56923c;p=mirror%2Ffrr.git

debian: Temporary fix to get quagga services running

Modify quagga startup control files to allow
for temporary startup while we iron out the
network.target details

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/debian/bgpd.service b/debian/bgpd.service
index 329dc08dbd..6772787549 100644
--- a/debian/bgpd.service
+++ b/debian/bgpd.service
@@ -16,4 +16,4 @@ LimitNOFILE=1024
 ExecStart=/usr/lib/quagga/bgpd $BGPD_OPTIONS
 ExecStartPost=/usr/bin/vtysh -b -n
 [Install]
-WantedBy=network.target
+WantedBy=network-online.target
diff --git a/debian/isisd.service b/debian/isisd.service
index 61a13aef58..04b128a8e2 100644
--- a/debian/isisd.service
+++ b/debian/isisd.service
@@ -17,4 +17,4 @@ LimitNOFILE=1024
 ExecStart=/usr/lib/quagga/isisd $ISISD_OPTIONS
 ExecStartPost=/usr/bin/vtysh -b -n
 [Install]
-WantedBy=network.target
+WantedBy=network-online.target
diff --git a/debian/ospf6d.service b/debian/ospf6d.service
index 8ceeb86185..48b6ddb319 100644
--- a/debian/ospf6d.service
+++ b/debian/ospf6d.service
@@ -16,4 +16,4 @@ Restart=on-abnormal
 ExecStart=/usr/lib/quagga/ospf6d $OSPF6D_OPTIONS
 ExecStartPost=/usr/bin/vtysh -b  -n
 [Install]
-WantedBy=network.target
+WantedBy=network-online.target
diff --git a/debian/ospfd.service b/debian/ospfd.service
index 36bbab4997..d4213c8ad7 100644
--- a/debian/ospfd.service
+++ b/debian/ospfd.service
@@ -17,4 +17,4 @@ LimitNOFILE=1024
 ExecStart=/usr/lib/quagga/ospfd $OSPFD_OPTIONS
 ExecStartPost=/usr/bin/vtysh -b  -n
 [Install]
-WantedBy=network.target
+WantedBy=networkonline.target
diff --git a/debian/quagga.service b/debian/quagga.service
index f39942ae1d..261df9606b 100644
--- a/debian/quagga.service
+++ b/debian/quagga.service
@@ -29,4 +29,4 @@ ExecStopPost=-/bin/systemctl stop ripngd.service
 ExecStopPost=-/bin/systemctl stop zebra.service
 
 [Install]
-WantedBy=network.target
+WantedBy=network-online.target
diff --git a/debian/ripd.service b/debian/ripd.service
index eed5dbc48d..7b131b87be 100644
--- a/debian/ripd.service
+++ b/debian/ripd.service
@@ -17,4 +17,4 @@ LimitNOFILE=1024
 ExecStart=/usr/lib/quagga/ripd $RIPD_OPTIONS
 ExecStartPost=/usr/bin/vtysh -b -n
 [Install]
-WantedBy=network.target
+WantedBy=network-online.target
diff --git a/debian/ripngd.service b/debian/ripngd.service
index 93413cd463..8c98620aef 100644
--- a/debian/ripngd.service
+++ b/debian/ripngd.service
@@ -17,4 +17,4 @@ LimitNOFILE=1024
 ExecStart=/usr/lib/quagga/ripngd $RIPNGD_OPTIONS
 ExecStartPost=/usr/bin/vtysh -b -n
 [Install]
-WantedBy=network.target
+WantedBy=network-online.target
diff --git a/debian/zebra.service b/debian/zebra.service
index 3fa40432d9..e540e49330 100644
--- a/debian/zebra.service
+++ b/debian/zebra.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Cumulus Linux Quagga Zebra Daemon
-After=network.service syslog.service
+After=networking.service syslog.service
 OnFailure=heartbeat-failed@%n.service
 
 [Service]
@@ -17,4 +17,4 @@ LimitNOFILE=1024
 ExecStart=/usr/lib/quagga/zebra $ZEBRA_OPTIONS
 ExecStartPost=/usr/bin/vtysh -b -n
 [Install]
-WantedBy=network.target
+WantedBy=network-online.target