From 9a737340cd836591c0e3fb10eafe795bd8cba2f8 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Sun, 19 Apr 2009 20:32:11 +0000 Subject: [PATCH] [package] fix babel init script and install it by default (#4939) SVN-Revision: 15275 --- ipv6/babel/Makefile | 4 +++- ipv6/babel/files/babel.init | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ipv6/babel/Makefile b/ipv6/babel/Makefile index 6c37ee86fa..69712861a7 100644 --- a/ipv6/babel/Makefile +++ b/ipv6/babel/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=babel PKG_VERSION:=0.94 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.pps.jussieu.fr/~jch/software/files/ @@ -48,6 +48,8 @@ define Package/babel/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/babel $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc $(INSTALL_CONF) ./files/babel.conf $(1)/etc/ + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/babel.init $(1)/etc/init.d/babel endef $(eval $(call BuildPackage,babel)) diff --git a/ipv6/babel/files/babel.init b/ipv6/babel/files/babel.init index 5c0ad53f72..9e116574ad 100755 --- a/ipv6/babel/files/babel.init +++ b/ipv6/babel/files/babel.init @@ -10,7 +10,7 @@ babel_config() { } start() { - if [ -x /etc/init.d/ahcpd ] ; then + if [ -x /etc/rc.d/S71ahcpd ] ; then echo 'Not starting babel -- will be started by ahcpd.' exit 0 fi @@ -20,7 +20,7 @@ start() { if [ -e $pidfile ] ; then echo "$pidfile exists -- not starting babel." >&2 else - /usr/bin/babel -D -I $pidfile $interfaces + /usr/sbin/babel -D -I $pidfile $interfaces fi } @@ -28,5 +28,5 @@ stop() { [ -e $pidfile ] && kill $(cat $pidfile) [ -e $pidfile ] && sleep 2 [ -e $pidfile ] && sleep 4 - [ -e $pidfile ] && echo "Failed to stop ahcpd ($pidfile still exists)." + [ -e $pidfile ] && echo "Failed to stop babel ($pidfile still exists)." } -- 2.30.2