From: Donald Sharp <sharpd@cumulusnetwroks.com>
Date: Mon, 13 Jun 2016 23:07:49 +0000 (-0400)
Subject: debian: Modifications to allow redhat to work properly
X-Git-Tag: frr-2.0-rc1~535
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=803d367ed148d186f3271188c9d365b92cea1984;p=matthieu%2Ffrr.git

debian: Modifications to allow redhat to work properly

Modify the control files to allow redhat to build properly.

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

diff --git a/debian/quagga.install b/debian/quagga.install
index 991414df6e..2651dd9e00 100644
--- a/debian/quagga.install
+++ b/debian/quagga.install
@@ -19,5 +19,5 @@ usr/share/man/man8/isisd.8
 usr/share/man/man8/watchquagga.8
 usr/share/snmp/mibs/
 cumulus/etc/* etc/
-debian/*.service    lib/systemd/system
+tools/*.service    lib/systemd/system
 debian/quagga.conf  usr/lib/tmpfiles.d
diff --git a/debian/quagga.service b/debian/quagga.service
deleted file mode 100644
index a2c1df38d7..0000000000
--- a/debian/quagga.service
+++ /dev/null
@@ -1,22 +0,0 @@
-[Unit]
-Description=Cumulus Linux Quagga
-After=syslog.target networking.service
-OnFailure=heartbeat-failed@%n.service
-
-[Service]
-Nice=-5
-EnvironmentFile=/etc/default/quagga
-Type=forking
-NotifyAccess=all
-StartLimitInterval=3m
-StartLimitBurst=3
-TimeoutSec=1m
-WatchdogSec=60s
-RestartSec=5
-Restart=on-abnormal
-LimitNOFILE=1024
-ExecStart=/usr/lib/quagga/quagga start
-ExecStop=/usr/lib/quagga/quagga stop
-ExecReload=/usr/lib/quagga/quagga-reload.py --reload /etc/quagga/Quagga.conf
-[Install]
-WantedBy=network-online.target
diff --git a/tools/quagga.service b/tools/quagga.service
new file mode 100644
index 0000000000..a2c1df38d7
--- /dev/null
+++ b/tools/quagga.service
@@ -0,0 +1,22 @@
+[Unit]
+Description=Cumulus Linux Quagga
+After=syslog.target networking.service
+OnFailure=heartbeat-failed@%n.service
+
+[Service]
+Nice=-5
+EnvironmentFile=/etc/default/quagga
+Type=forking
+NotifyAccess=all
+StartLimitInterval=3m
+StartLimitBurst=3
+TimeoutSec=1m
+WatchdogSec=60s
+RestartSec=5
+Restart=on-abnormal
+LimitNOFILE=1024
+ExecStart=/usr/lib/quagga/quagga start
+ExecStop=/usr/lib/quagga/quagga stop
+ExecReload=/usr/lib/quagga/quagga-reload.py --reload /etc/quagga/Quagga.conf
+[Install]
+WantedBy=network-online.target