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 2ef0081427560fa344753da718bad7b53af27b69..d1e76cc451ce95b70433493f149b4acdfad2d244 100644 (file)
--- 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 001a72d2954e5138d9a5930c26465c5d03ae7fa8..f8d3b73474eb33ae9210cfb92e06ebebc4e6ee56 100644 (file)
--- 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 c3966d4fa15a6078b1e19a8be616a7adbd3eaed0..b212bd2f88aeed732007c8fdef77ed9d64e279e9 100644 (file)
--- 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 371565ba9cd1d5ad17f6170a1906ca27a31d2367..cd3cad57da28b514ae1eb5a83c57cf74bb5c8f0e 100644 (file)
--- 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 e93614d4b3b7be6e1375e3e15142b49399de1638..dc0ebc678792cd395894c3b072eb6d13fd35c274 100644 (file)
--- 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 14ac7937bc9ea8483946742e44e25f68c6223cf4..135ce53fa585e747bb77e789aedfc22fd64c16d9 100644 (file)
--- 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 7c90d27c0291993f5bad1a2d980cf959940b879f..7342713eda8daa417362d9bea780d543818d4019 100644 (file)
--- 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 89314f2d7f7e179b4fd48ec4cf6eaac118dd485c..74a068340d6b88a96ee81afe1935507e3e71005a 100644 (file)
--- 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 21858aab6af3cac4ad14dd45efbed3725ae6df77..a43335ecf63adfc72ad92bb86a18c6a05d5c63f5 100755 (executable)
--- 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