[packages_10.03.2] radvd: backport r28927

git-svn-id: svn://svn.openwrt.org/openwrt/branches/packages_10.03.2@30315 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/ipv6/radvd/Makefile b/ipv6/radvd/Makefile
index 01b1b6d..671e725 100644 (file)
--- a/ipv6/radvd/Makefile
+++ b/ipv6/radvd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=radvd
 PKG_VERSION:=1.8.3
-PKG_RELEASE:=2
+PKG_RELEASE:=2.1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://v6web.litech.org/radvd/dist \

diff --git a/ipv6/radvd/files/radvd.init b/ipv6/radvd/files/radvd.init
index d513bba..62e184b 100644 (file)
--- a/ipv6/radvd/files/radvd.init
+++ b/ipv6/radvd/files/radvd.init
@@ -1,7 +1,11 @@
 #!/bin/sh /etc/rc.common
+# Copyright (C) 2008-2011 OpenWrt.org
 # Copyright (C) 2008  Alina Friedrichsen <x-alina@gmx.net>
+
 START=50
 
+SERVICE_USE_PID=1
+
 RADVD_INTERFACE_STRING_OPTIONS='MaxRtrAdvInterval MinRtrAdvInterval MinDelayBetweenRAs AdvLinkMTU AdvReachableTime AdvRetransTimer AdvCurHopLimit AdvDefaultLifetime AdvDefaultPreference HomeAgentLifetime HomeAgentPreference'
 RADVD_INTERFACE_BOOLEAN_OPTIONS='IgnoreIfMissing AdvSendAdvert UnicastOnly AdvManagedFlag AdvOtherConfigFlag AdvSourceLLAddress AdvHomeAgentFlag AdvHomeAgentInfo AdvMobRtrSupportFlag AdvIntervalOpt'
 
@@ -425,9 +429,9 @@ start() {
 
        sysctl -w net.ipv6.conf.all.forwarding=1 > /dev/null 2> /dev/null
 
-       radvd -C "$RADVD_CONFIG_FILE" -m stderr_syslog -p /var/run/radvd.pid
+       service_start /usr/sbin/radvd -C "$RADVD_CONFIG_FILE" -m stderr_syslog -p /var/run/radvd.pid
 }
 
 stop() {
-       killall radvd
+       service_stop /usr/sbin/radvd
 }