Difuse/routing
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #15 from Noltari/bird-next

Browse source 
Bird Improvements
This commit is contained in:
Jo-Philipp Wich 2014-01-19 09:44:52 -08:00
commit a9532755db
5 changed files with 22 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bird/Makefile
View file

@ -1,5 +1,5 @@
# #
# Copyright (C) 2009-2012 OpenWrt.org # Copyright (C) 2009-2014 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=bird PKG_NAME:=bird
PKG_VERSION:=1.4.0 PKG_VERSION:=1.4.0
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=bird-$(PKG_VERSION).tar.gz PKG_SOURCE:=bird-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=ftp://bird.network.cz/pub/bird PKG_SOURCE_URL:=ftp://bird.network.cz/pub/bird
@ -133,7 +133,6 @@ $(STAMP_BUILT): $(STAMP_BUILT)-$(2)
define Package/bird$(2)/install define Package/bird$(2)/install
$(INSTALL_DIR) $$(1)/usr/sbin $(INSTALL_DIR) $$(1)/usr/sbin
$(INSTALL_BIN) $$(PKG_BUILD_DIR)/bird$(2) $$(1)/usr/sbin/ $(INSTALL_BIN) $$(PKG_BUILD_DIR)/bird$(2) $$(1)/usr/sbin/
$(INSTALL_BIN) ./files/bird$(2)loop $$(1)/usr/sbin/
$(INSTALL_DIR) $$(1)/etc $(INSTALL_DIR) $$(1)/etc
$(INSTALL_DATA) ./files/bird$(2).conf $$(1)/etc/ $(INSTALL_DATA) ./files/bird$(2).conf $$(1)/etc/
$(INSTALL_DIR) $$(1)/etc/init.d $(INSTALL_DIR) $$(1)/etc/init.d

18
bird/files/bird4.init
View file

@ -1,24 +1,26 @@
#!/bin/sh /etc/rc.common #!/bin/sh /etc/rc.common
# Copyright (C) 2010-2011 OpenWrt.org # Copyright (C) 2010-2014 OpenWrt.org
BIRD="bird4"
START=99 START=99
STOP=10 STOP=10
SERVICE_DAEMONIZE=1 SERVICE_DAEMONIZE=1
SERVICE_WRITE_PID=1 SERVICE_USE_PID=1
SERVICE_PID_FILE="/var/run/$BIRD.pid"
BIRD="/usr/sbin/bird4 -c /etc/bird4.conf" BIRD_BIN="/usr/sbin/$BIRD"
BIRD_CONF="/etc/$BIRD.conf"
start() { start() {
service_start $BIRD -d service_start $BIRD_BIN -d -c $BIRD_CONF -P $SERVICE_PID_FILE
# ( SERVICE_MATCH_NAME=1 service_start /usr/sbin/bird4loop )
} }
stop() { stop() {
# ( SERVICE_MATCH_NAME=1 service_stop /usr/sbin/bird4loop ) service_stop $BIRD_BIN
service_stop $BIRD
} }
reload() { reload() {
service_reload $BIRD service_reload $BIRD_BIN
} }

24
bird/files/bird4loop
View file

@ -1,24 +0,0 @@
#!/bin/sh
BIRD="/usr/sbin/bird4 -c /etc/bird4.conf"
$BIRD -p || return 1
. /lib/functions.sh
. /lib/functions/service.sh
SERVICE_DAEMONIZE=1
SERVICE_WRITE_PID=1
sig_handler() {
running=0
service_stop $BIRD
}
running=1
trap sig_handler INT
trap sig_handler TERM
while [ $running -gt 0 ]; do
service_check $BIRD || service_start $BIRD -d "$@"
sleep 3
done

18
bird/files/bird6.init
View file

@ -1,24 +1,26 @@
#!/bin/sh /etc/rc.common #!/bin/sh /etc/rc.common
# Copyright (C) 2010-2011 OpenWrt.org # Copyright (C) 2010-2014 OpenWrt.org
BIRD="bird6"
START=99 START=99
STOP=10 STOP=10
SERVICE_DAEMONIZE=1 SERVICE_DAEMONIZE=1
SERVICE_WRITE_PID=1 SERVICE_USE_PID=1
SERVICE_PID_FILE="/var/run/$BIRD.pid"
BIRD="/usr/sbin/bird6 -c /etc/bird6.conf" BIRD_BIN="/usr/sbin/$BIRD"
BIRD_CONF="/etc/$BIRD.conf"
start() { start() {
service_start $BIRD -d service_start $BIRD_BIN -d -c $BIRD_CONF -P $SERVICE_PID_FILE
# ( SERVICE_MATCH_NAME=1 service_start /usr/sbin/bird6loop )
} }
stop() { stop() {
# ( SERVICE_MATCH_NAME=1 service_stop /usr/sbin/bird6loop ) service_stop $BIRD_BIN
service_stop $BIRD
} }
reload() { reload() {
service_reload $BIRD service_reload $BIRD_BIN
} }

24
bird/files/bird6loop
View file

@ -1,24 +0,0 @@
#!/bin/sh
BIRD="/usr/sbin/bird6 -c /etc/bird6.conf"
$BIRD -p || return 1
. /lib/functions.sh
. /lib/functions/service.sh
SERVICE_DAEMONIZE=1
SERVICE_WRITE_PID=1
sig_handler() {
running=0
service_stop $BIRD
}
running=1
trap sig_handler INT
trap sig_handler TERM
while [ $running -gt 0 ]; do
service_check $BIRD || service_start $BIRD -d "$@"
sleep 3
done