debian: Revamp startup again

Remove quagga.service, it was a bad idea culminating in a
series of mistakes.

Replaced with /usr/lib/quagga/quagga script.

Use this script to start/stop quagga as a whole.

Ticket: CM-9445
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Reviewed-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by: Dave Olson <olson@cumulusnetworks.com>

10 files changed, 9 insertions, 45 deletions

diff --git a/debian/bgpd.service b/debian/bgpd.service
index 3162df1a4..ace3ba558 100644
--- a/debian/bgpd.service
+++ b/debian/bgpd.service
@@ -9,7 +9,7 @@ Nice=-5
 EnvironmentFile=/etc/default/quagga
 Type=notify
 StartLimitInterval=3m
-StartLimitBurst=3
+StartLimitBurst=6
 TimeoutSec=1m
 WatchdogSec=60s
 RestartSec=5
diff --git a/debian/isisd.service b/debian/isisd.service
index 888aaa062..c86804118 100644
--- a/debian/isisd.service
+++ b/debian/isisd.service
@@ -9,7 +9,7 @@ Nice=-5
 Type=notify
 EnvironmentFile=/etc/default/quagga
 StartLimitInterval=3m
-StartLimitBurst=3
+StartLimitBurst=6
 TimeoutSec=1m
 WatchdogSec=60s
 RestartSec=5
diff --git a/debian/ospf6d.service b/debian/ospf6d.service
index 31a9cd477..95c237da9 100644
--- a/debian/ospf6d.service
+++ b/debian/ospf6d.service
@@ -9,7 +9,7 @@ Nice=-5
 Type=notify
 EnvironmentFile=/etc/default/quagga
 StartLimitInterval=3m
-StartLimitBurst=3
+StartLimitBurst=6
 TimeoutSec=1m
 WatchdogSec=60s
 RestartSec=5
diff --git a/debian/ospfd.service b/debian/ospfd.service
index 92c310f64..e3ff04738 100644
--- a/debian/ospfd.service
+++ b/debian/ospfd.service
@@ -9,7 +9,7 @@ Type=notify
 Nice=-5
 EnvironmentFile=/etc/default/quagga
 StartLimitInterval=3m
-StartLimitBurst=3
+StartLimitBurst=6
 TimeoutSec=1m
 WatchdogSec=60s
 RestartSec=5
diff --git a/debian/ospfd@.service b/debian/ospfd@.service
index eb3fe9c1d..64370cce2 100644
--- a/debian/ospfd@.service
+++ b/debian/ospfd@.service
@@ -9,7 +9,7 @@ Type=notify
 Nice=-5
 EnvironmentFile=/etc/default/quagga
 StartLimitInterval=3m
-StartLimitBurst=3
+StartLimitBurst=15
 TimeoutSec=1m
 WatchdogSec=60s
 RestartSec=5
@@ -17,6 +17,6 @@ Restart=on-abnormal
 LimitNOFILE=1024
 ExecStart=/usr/lib/quagga/ospfd $OSPFD_OPTIONS -n %I
 ExecStartPost=/usr/bin/vtysh -b  -n
-ExecStopPost=/bin/touch /var/run/quagga/ospfd.%I.was_running
+ExecStopPost=/bin/touch /var/run/quagga/ospfd@%I.was_running
 [Install]
 WantedBy=network-online.target
diff --git a/debian/quagga.install b/debian/quagga.install
index 0c3db58ff..14ac7937b 100644
--- a/debian/quagga.install
+++ b/debian/quagga.install
@@ -3,7 +3,7 @@ usr/bin/vtysh
 usr/include/quagga/
 usr/lib/
 tools/quagga-reload.py usr/lib/quagga/
-tools/startup usr/lib/quagga/
+tools/quagga usr/lib/quagga
 usr/share/doc/quagga/
 usr/share/man/man1/vtysh.1
 usr/share/man/man8
diff --git a/debian/quagga.service b/debian/quagga.service
deleted file mode 100644
index f052740b8..000000000
--- a/debian/quagga.service
+++ /dev/null
@@ -1,34 +0,0 @@
-[Unit]
-Description=Cumulus Linux Quagga convenience service
-After=networking.service syslog.service
-
-[Service]
-EnvironmentFile=-/etc/default/quagga
-Type=simple
-RemainAfterExit=yes
-TimeoutSec=2m30s
-TimeoutStopSec=1m
-ExecStartPre=-/usr/lib/quagga/startup zebra
-ExecStartPre=-/usr/lib/quagga/startup bgpd
-ExecStartPre=-/usr/lib/quagga/startup isisd
-ExecStartPre=-/usr/lib/quagga/startup ospfd
-ExecStartPre=-/usr/lib/quagga/startup ospf6d
-ExecStartPre=-/usr/lib/quagga/startup ripd
-ExecStartPre=-/usr/lib/quagga/startup ripngd
-ExecStartPost=-/usr/bin/vtysh -b -n
-#
-ExecReload=/usr/lib/quagga/quagga-reload.py --reload /etc/quagga/Quagga.conf
-#
-ExecStart=/bin/true
-ExecStop=/bin/true
-#
-ExecStopPost=-/bin/systemctl stop bgpd.service
-ExecStopPost=-/bin/systemctl stop isisd.service
-ExecStopPost=-/bin/systemctl stop ospfd.service
-ExecStopPost=-/bin/systemctl stop ospf6d.service
-ExecStopPost=-/bin/systemctl stop ripd.service
-ExecStopPost=-/bin/systemctl stop ripngd.service
-ExecStopPost=-/bin/systemctl stop zebra.service
-
-[Install]
-WantedBy=network-online.target
diff --git a/debian/ripd.service b/debian/ripd.service
index f322d8db5..f001b797f 100644
--- a/debian/ripd.service
+++ b/debian/ripd.service
@@ -9,7 +9,7 @@ Nice=-5
 Type=notify
 EnvironmentFile=/etc/default/quagga
 StartLimitInterval=3m
-StartLimitBurst=3
+StartLimitBurst=6
 TimeoutSec=1m
 WatchdogSec=60s
 RestartSec=5
diff --git a/debian/rules b/debian/rules
index 30220c920..f8fc2fa4d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -112,7 +112,6 @@ override_dh_auto_install:
 	sed -i "/dependency_libs/ s/'.*'/''/" debian/tmp/usr/lib/*.la
 
 override_dh_systemd_start:
-	dh_systemd_start quagga.service
 	dh_systemd_start bgpd.service
 	dh_systemd_start isisd.service
 	dh_systemd_start ospfd.service
@@ -122,7 +121,6 @@ override_dh_systemd_start:
 	dh_systemd_start zebra.service
 
 override_dh_systemd_enable:
-	dh_systemd_enable --no-enable quagga.service
 	dh_systemd_enable --no-enable bgpd.service
 	dh_systemd_enable --no-enable isisd.service
 	dh_systemd_enable --no-enable ospfd.service
diff --git a/debian/zebra.service b/debian/zebra.service
index 281a162d2..042d5a539 100644
--- a/debian/zebra.service
+++ b/debian/zebra.service
@@ -8,7 +8,7 @@ Nice=-5
 EnvironmentFile=/etc/default/quagga
 Type=notify
 StartLimitInterval=3m
-StartLimitBurst=3
+StartLimitBurst=6
 TimeoutSec=1m
 WatchdogSec=60s
 RestartSec=5