summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2016-03-03 15:26:56 +0100
committerDonald Sharp <sharpd@cumulusnetworks.com>2016-03-03 16:25:36 +0100
commit3de8e929db2be4da709090915da9600231cc60e4 (patch)
tree2ac80379758b137ff82a5867f0b684de8cfaf76c /debian
parentip/ipv6 prefix-list seq number range needs to be fixed - wraps around to (diff)
downloadfrr-3de8e929db2be4da709090915da9600231cc60e4.tar.xz
frr-3de8e929db2be4da709090915da9600231cc60e4.zip
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>
Diffstat (limited to 'debian')
-rw-r--r--debian/bgpd.service2
-rw-r--r--debian/isisd.service2
-rw-r--r--debian/ospf6d.service2
-rw-r--r--debian/ospfd.service2
-rw-r--r--debian/ospfd@.service2
-rw-r--r--debian/quagga.install2
-rw-r--r--debian/ripd.service2
-rw-r--r--debian/zebra.service2
8 files changed, 8 insertions, 8 deletions
diff --git a/debian/bgpd.service b/debian/bgpd.service
index 2ef008142..d1e76cc45 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 001a72d29..f8d3b7347 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 c3966d4fa..b212bd2f8 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 371565ba9..cd3cad57d 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 e93614d4b..dc0ebc678 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 14ac7937b..135ce53fa 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 7c90d27c0..7342713ed 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 89314f2d7..74a068340 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