From 886d18075f5034eec59ddce75650076739a419dc Mon Sep 17 00:00:00 2001 From: florian Date: Sat, 11 Oct 2008 13:18:04 +0000 Subject: [PATCH] Fix ip path checking and make 6scripts depend on kmod-ipv6 (#4085) git-svn-id: svn://svn.openwrt.org/openwrt/packages@12953 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- ipv6/6scripts/Makefile | 1 + ipv6/6scripts/files/6tunnel.init | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/ipv6/6scripts/Makefile b/ipv6/6scripts/Makefile index 5600ff0be..2b398d080 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 cd4e1fc02..84ba32563 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