From: Álvaro Fernández Rojas <noltari@gmail.com>
Date: Fri, 17 Jan 2014 19:24:45 +0000 (+0100)
Subject: [bird] Improve init files.
X-Git-Url: http://git.openwrt.org/?p=feed%2Frouting.git;a=commitdiff_plain;h=8731e0647a475105acc254bc44aab50e4a828003

[bird] Improve init files.
---

diff --git a/bird/files/bird4.init b/bird/files/bird4.init
index 4fbd302..80bc516 100644
--- a/bird/files/bird4.init
+++ b/bird/files/bird4.init
@@ -1,22 +1,25 @@
 #!/bin/sh /etc/rc.common
 # Copyright (C) 2010-2014 OpenWrt.org
 
+BIRD="bird4"
+
 START=99
 STOP=10
 
 SERVICE_DAEMONIZE=1
 SERVICE_WRITE_PID=1
 
-BIRD="/usr/sbin/bird4 -c /etc/bird4.conf"
+BIRD_BIN="/usr/sbin/$BIRD"
+BIRD_CONF="/etc/$BIRD.conf"
 
 start() {
-	service_start $BIRD -d
+	service_start $BIRD_BIN -d -c $BIRD_CONF
 }
 
 stop() {
-	service_stop $BIRD
+	service_stop $BIRD_BIN
 }
 
 reload() {
-	service_reload $BIRD
+	service_reload $BIRD_BIN
 }
diff --git a/bird/files/bird6.init b/bird/files/bird6.init
index 9089e00..2b39e3f 100644
--- a/bird/files/bird6.init
+++ b/bird/files/bird6.init
@@ -1,22 +1,25 @@
 #!/bin/sh /etc/rc.common
 # Copyright (C) 2010-2014 OpenWrt.org
 
+BIRD="bird6"
+
 START=99
 STOP=10
 
 SERVICE_DAEMONIZE=1
 SERVICE_WRITE_PID=1
 
-BIRD="/usr/sbin/bird6 -c /etc/bird6.conf"
+BIRD_BIN="/usr/sbin/$BIRD"
+BIRD_CONF="/etc/$BIRD.conf"
 
 start() {
-	service_start $BIRD -d
+	service_start $BIRD_BIN -d -c $BIRD_CONF
 }
 
 stop() {
-	service_stop $BIRD
+	service_stop $BIRD_BIN
 }
 
 reload() {
-	service_reload $BIRD
+	service_reload $BIRD_BIN
 }