From: Florian Fainelli <florian@openwrt.org>
Date: Sat, 11 Oct 2008 13:18:04 +0000 (+0000)
Subject: Fix ip path checking and make 6scripts depend on kmod-ipv6 (#4085)
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=b08c3b25b005408fac621be50067ec23c8cb52e7;ds=sidebyside

Fix ip path checking and make 6scripts depend on kmod-ipv6 (#4085)

SVN-Revision: 12953
---

diff --git a/ipv6/6scripts/Makefile b/ipv6/6scripts/Makefile
index 5600ff0be0..2b398d0808 100644
--- a/ipv6/6scripts/Makefile
+++ b/ipv6/6scripts/Makefile
@@ -17,6 +17,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/6scripts
   SECTION:=ipv6
   CATEGORY:=IPv6
+  DEPENDS:=+kmod-ipv6
   TITLE:=IPv6 scripts
 endef
 
diff --git a/ipv6/6scripts/files/6tunnel.init b/ipv6/6scripts/files/6tunnel.init
index cd4e1fc027..84ba325632 100644
--- a/ipv6/6scripts/files/6tunnel.init
+++ b/ipv6/6scripts/files/6tunnel.init
@@ -46,11 +46,7 @@ stop_service() {
 	ip tunnel del $tnlifname
 }
 start() {
-	if ! [ -f /proc/net/if_inet6 ]; then
-		echo "IPv6 not enabled, install kmod-ipv6";
-		exit 1;
-	fi
-	if ! [ -x /sbin/ip ]; then
+	if ! [ -x /usr/sbin/ip ]; then
 		echo "ip is required to setup the tunnel";
 		exit 1;
 	fi