From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 5 Feb 2012 19:01:29 +0000 (+0000)
Subject: [packages_10.03.2] radvd: backport r28927
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6d481d72f321aa4de9d42799f8a4864f124b9958;p=openwrt%2Fsvn-archive%2Farchive.git

[packages_10.03.2] radvd: backport r28927

SVN-Revision: 30315
---

diff --git a/ipv6/radvd/Makefile b/ipv6/radvd/Makefile
index 01b1b6d900..671e725eb2 100644
--- 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 d513bba294..62e184b77b 100644
--- 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
 }