From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 5 Feb 2012 03:27:10 +0000 (+0000)
Subject: [packages_10.03.2] mrd6: merge r28925
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=db2c3695fc553a859daf049601d1608ecb46c020;p=openwrt%2Fsvn-archive%2Farchive.git

[packages_10.03.2] mrd6: merge r28925

SVN-Revision: 30175
---

diff --git a/ipv6/mrd6/Makefile b/ipv6/mrd6/Makefile
index d71ed345f3..dc99a2100b 100644
--- a/ipv6/mrd6/Makefile
+++ b/ipv6/mrd6/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mrd6
 PKG_VERSION:=0.9.6
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
 PKG_SOURCE_URL:=http://ftp.de.debian.org/debian/pool/main/m/mrd6/
@@ -25,7 +25,7 @@ define Package/mrd6
   CATEGORY:=IPv6
   TITLE:=IPv6 multicast routing daemon
   URL:=http://fivebits.net/proj/mrd6
-  DEPENDS:=+libstdcpp
+  DEPENDS:=+kmod-ipv6 +libstdcpp
 endef
 
 define Package/mrd6/description
diff --git a/ipv6/mrd6/files/mrd6.init b/ipv6/mrd6/files/mrd6.init
index 70b88fb8e0..24818407f4 100644
--- a/ipv6/mrd6/files/mrd6.init
+++ b/ipv6/mrd6/files/mrd6.init
@@ -1,22 +1,13 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
+
 START=50
 
 start() {
-	/sbin/lsmod | grep ipv6 > /dev/null
-	if [ "$?" != "0" ]; then
-		echo -n "IPv6 stack required by mrd6. Loading ipv6 module: "
-		/sbin/insmod ipv6
-		echo "Done."
-	fi
-	echo -n "Starting IPv6 multicast router (mrd6): "
-	/usr/sbin/mrd6 -f /etc/mrd6.conf -D
-	echo "Done."
+	service_start /usr/sbin/mrd6 -f /etc/mrd6.conf -D
 }
 
 stop() {
-	echo -n "Stopping IPv6 multicast router (mrd6): "
-	killall mrd6
-	echo "Done."
+	service_stop /usr/sbin/mrd6
 }