From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 3 Mar 2016 14:26:56 +0000 (-0500)
Subject: debian: Fixup install location of quagga
X-Git-Tag: frr-2.0-rc1~1078
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=3de8e929db2be4da709090915da9600231cc60e4;p=mirror%2Ffrr.git

debian: Fixup install location of quagga

Fix the install location of the quagga script
to /usr/bin/quagga.

Additionally reset restart controls to a more
normal level in the service files.

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

diff --git a/debian/bgpd.service b/debian/bgpd.service
index 2ef0081427..d1e76cc451 100644
--- a/debian/bgpd.service
+++ b/debian/bgpd.service
@@ -9,7 +9,7 @@ Nice=-5
 EnvironmentFile=/etc/default/quagga
 Type=notify
 StartLimitInterval=3m
-StartLimitBurst=6
+StartLimitBurst=3
 TimeoutSec=1m
 WatchdogSec=60s
 RestartSec=5
diff --git a/debian/isisd.service b/debian/isisd.service
index 001a72d295..f8d3b73474 100644
--- a/debian/isisd.service
+++ b/debian/isisd.service
@@ -9,7 +9,7 @@ Nice=-5
 Type=notify
 EnvironmentFile=/etc/default/quagga
 StartLimitInterval=3m
-StartLimitBurst=6
+StartLimitBurst=3
 TimeoutSec=1m
 WatchdogSec=60s
 RestartSec=5
diff --git a/debian/ospf6d.service b/debian/ospf6d.service
index c3966d4fa1..b212bd2f88 100644
--- a/debian/ospf6d.service
+++ b/debian/ospf6d.service
@@ -9,7 +9,7 @@ Nice=-5
 Type=notify
 EnvironmentFile=/etc/default/quagga
 StartLimitInterval=3m
-StartLimitBurst=6
+StartLimitBurst=3
 TimeoutSec=1m
 WatchdogSec=60s
 RestartSec=5
diff --git a/debian/ospfd.service b/debian/ospfd.service
index 371565ba9c..cd3cad57da 100644
--- a/debian/ospfd.service
+++ b/debian/ospfd.service
@@ -9,7 +9,7 @@ Type=notify
 Nice=-5
 EnvironmentFile=/etc/default/quagga
 StartLimitInterval=3m
-StartLimitBurst=6
+StartLimitBurst=3
 TimeoutSec=1m
 WatchdogSec=60s
 RestartSec=5
diff --git a/debian/ospfd@.service b/debian/ospfd@.service
index e93614d4b3..dc0ebc6787 100644
--- a/debian/ospfd@.service
+++ b/debian/ospfd@.service
@@ -9,7 +9,7 @@ Type=notify
 Nice=-5
 EnvironmentFile=/etc/default/quagga
 StartLimitInterval=3m
-StartLimitBurst=15
+StartLimitBurst=10
 TimeoutSec=1m
 WatchdogSec=60s
 RestartSec=5
diff --git a/debian/quagga.install b/debian/quagga.install
index 14ac7937bc..135ce53fa5 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/quagga usr/lib/quagga
+tools/quagga usr/bin
 usr/share/doc/quagga/
 usr/share/man/man1/vtysh.1
 usr/share/man/man8
diff --git a/debian/ripd.service b/debian/ripd.service
index 7c90d27c02..7342713eda 100644
--- a/debian/ripd.service
+++ b/debian/ripd.service
@@ -9,7 +9,7 @@ Nice=-5
 Type=notify
 EnvironmentFile=/etc/default/quagga
 StartLimitInterval=3m
-StartLimitBurst=6
+StartLimitBurst=3
 TimeoutSec=1m
 WatchdogSec=60s
 RestartSec=5
diff --git a/debian/zebra.service b/debian/zebra.service
index 89314f2d7f..74a068340d 100644
--- a/debian/zebra.service
+++ b/debian/zebra.service
@@ -8,7 +8,7 @@ Nice=-5
 EnvironmentFile=/etc/default/quagga
 Type=notify
 StartLimitInterval=3m
-StartLimitBurst=6
+StartLimitBurst=3
 TimeoutSec=1m
 WatchdogSec=60s
 RestartSec=5
diff --git a/tools/quagga b/tools/quagga
index 21858aab6a..a43335ecf6 100755
--- a/tools/quagga
+++ b/tools/quagga
@@ -67,6 +67,14 @@ case "$1" in
 	 /usr/lib/quagga/quagga-reload.py --reload /etc/quagga/Quagga.conf
 	 exit $?
 	 ;;
+     status)
+	 systemctl -l -o cat -n0 status zebra bgpd ospfd ospf6d ripd ripngd isisd
+	 exit $?
+         ;;
+     *)
+	 echo "Unknown option entered"
+	 exit -1
+	 ;;
 esac
 
 exit 0