From e9e6fbf924630abf821aa38f99e571f706536350 Mon Sep 17 00:00:00 2001
From: Ondrej Filip <feela@network.cz>
Date: Wed, 5 Feb 2014 15:57:37 +0100
Subject: Minor changes in Fedora init script.

---
 misc/bird.init | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'misc')

diff --git a/misc/bird.init b/misc/bird.init
index 56842bfa..23d6d8af 100755
--- a/misc/bird.init
+++ b/misc/bird.init
@@ -26,7 +26,7 @@ BIRD6="yes"
 [ -f /usr/sbin/bird ] || BIRD4="no"
 [ "${NETWORKING}" = "yes" ] || BIRD4="no"
 
-[ -f /etc/bird-6.conf ] || BIRD6="no"
+[ -f /etc/bird6.conf ] || BIRD6="no"
 [ -f /usr/sbin/bird6 ] || BIRD6="no"
 [ "${NETWORKING_IPV6}" = "yes" ] || BIRD6="no"
 
@@ -76,13 +76,17 @@ case "$1" in
 	RETVAL=$?
 	;;
   reload)
-	killall -HUP bird
-	killall -HUP bird6
+	killproc bird -HUP
+ 	RETVAL=$?
+	echo
+	echo -n "Reloading BIRD for IPv6: "
+	killproc bird6 -HUP
 	RETVAL=$?
+	echo
 	;;
   *)
 	echo "Usage: bird.init {start|stop|status|restart|reload}"
 	exit 1
 esac
 
-exit $REVAL
+exit $RETVAL
-- 
cgit v1.2.3


From 300e4008f02382b87409dabb52a317b8336de55b Mon Sep 17 00:00:00 2001
From: Ondrej Filip <feela@network.cz>
Date: Wed, 5 Feb 2014 23:32:28 +0100
Subject: Fedora init script improvement suggested by alex@alex.org.uk

---
 misc/bird.init | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'misc')

diff --git a/misc/bird.init b/misc/bird.init
index 23d6d8af..93aa83d6 100755
--- a/misc/bird.init
+++ b/misc/bird.init
@@ -22,6 +22,9 @@
 BIRD4="yes"
 BIRD6="yes"
 
+BIRD4ARGS=
+BIRD6ARGS=
+
 [ -f /etc/bird.conf ] || BIRD4="no"
 [ -f /usr/sbin/bird ] || BIRD4="no"
 [ "${NETWORKING}" = "yes" ] || BIRD4="no"
@@ -30,6 +33,8 @@ BIRD6="yes"
 [ -f /usr/sbin/bird6 ] || BIRD6="no"
 [ "${NETWORKING_IPV6}" = "yes" ] || BIRD6="no"
 
+[ -e /etc/sysconfig/bird ] && . /etc/sysconfig/bird
+
 RETVAL=0
 
 # See how we were called.
@@ -38,7 +43,7 @@ case "$1" in
 	if [ "$BIRD4" = "yes" ]
 	then
 		echo -n "Starting BIRD for IPv4: "
-		daemon bird
+		daemon bird ${BIRD4ARGS}
 		RETVAL=$?
 		echo
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/bird
@@ -46,7 +51,7 @@ case "$1" in
 	if [ "$BIRD6" = "yes" ]
 	then
 		echo -n "Starting BIRD for IPv6: "
-		daemon bird6
+		daemon bird6 ${BIRD6ARGS}
 		RETVAL=$?
 		echo
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/bird6
-- 
cgit v1.2.3