[packages/bird] rel 3; support BIRD_OPTS in /etc/sysconfig/bird*

[mmazur]

commit 21df4883001006c463531db8785e9d727da60b8e
Author: Mariusz Mazur <mmazur at axeos.com>
Date:   Thu Feb 5 12:19:17 2015 +0000

    rel 3; support BIRD_OPTS in /etc/sysconfig/bird*

 bird-ipv4.service   | 3 ++-
 bird-ipv4.sysconfig | 3 +++
 bird-ipv6.service   | 3 ++-
 bird-ipv6.sysconfig | 3 +++
 bird.spec           | 2 +-
 5 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/bird.spec b/bird.spec
index 0c09ed4..0caec96 100644
--- a/bird.spec
+++ b/bird.spec
@@ -10,7 +10,7 @@ Summary:	The BIRD Internet Routing Daemon
 Summary(pl.UTF-8):	Demon BIRD Internetowego Routingu Dynamicznego
 Name:		bird
 Version:	1.4.5
-Release:	2
+Release:	3
 License:	GPL v2+
 Group:		Networking/Daemons
 Source0:	ftp://bird.network.cz/pub/bird/%{name}-%{version}.tar.gz
diff --git a/bird-ipv4.service b/bird-ipv4.service
index 20f8904..0b43002 100644
--- a/bird-ipv4.service
+++ b/bird-ipv4.service
@@ -4,7 +4,8 @@ After=network.target
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/bird -u bird -g bird
+EnvironmentFile=/etc/sysconfig/bird-ipv4
+ExecStart=/usr/sbin/bird -u bird -g bird $BIRD_OPTS
 ExecReload=/usr/bin/kill -HUP $MAINPID
 
 [Install]
diff --git a/bird-ipv4.sysconfig b/bird-ipv4.sysconfig
index fe4aad5..714da4a 100644
--- a/bird-ipv4.sysconfig
+++ b/bird-ipv4.sysconfig
@@ -2,3 +2,6 @@
 
 # Define nice level for bird
 SERVICE_RUN_NICE_LEVEL="+5"
+
+# Additional options
+#BIRD_OPTS="-R"
diff --git a/bird-ipv6.service b/bird-ipv6.service
index e08eea3..041e08a 100644
--- a/bird-ipv6.service
+++ b/bird-ipv6.service
@@ -4,7 +4,8 @@ After=network.target
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/bird-6 -u bird -g bird
+EnvironmentFile=/etc/sysconfig/bird-ipv6
+ExecStart=/usr/sbin/bird-6 -u bird -g bird $BIRD_OPTS
 ExecReload=/usr/bin/kill -HUP $MAINPID
 
 [Install]
diff --git a/bird-ipv6.sysconfig b/bird-ipv6.sysconfig
index 700aa83..b6d200c 100644
--- a/bird-ipv6.sysconfig
+++ b/bird-ipv6.sysconfig
@@ -2,3 +2,6 @@
 
 # Define nice level for bird
 SERVICE_RUN_NICE_LEVEL="+5"
+
+# Additional options
+#BIRD_OPTS="-R"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/bird.git/commitdiff/21df4883001006c463531db8785e9d727da60b8e