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

diff --git a/bird-ipv4.service b/bird-ipv4.service
index 20f8904a0162ab3de1242c4f4897812d126af19f..0b43002c7cb60efaadfbdf3f5c211b3ffabed22c 100644 (file)
--- 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 fe4aad55b49e9a5894509bf9b7c58f925f5a9d21..714da4ae8c6972930e5fd2c76d8a555e7566a911 100644 (file)
--- 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 e08eea322f1d65bf2bb63a552462826d8270b4b2..041e08a5d5fd0db65cf97e322bd55284dedbfb26 100644 (file)
--- 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 700aa8374c44d354a1f64a8aa966b2af37bf7251..b6d200c01d0d05d9889d8f9fc058e8583a12c335 100644 (file)
--- 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"

diff --git a/bird.spec b/bird.spec
index 0c09ed49d4a028d25723a5a99e9e8189302e7ca2..0caec963b35e61a72f2399b16ed25943311d18f9 100644 (file)
--- 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