hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

6rd: honor tunlink in host dependency 

Signed-off-by: Steven Barth <steven@midlink.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44541 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Steven Barth 2015-02-26 07:42:12 +00:00
parent 810afa9a4a
commit 15f585d91c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/network/ipv6/6rd/Makefile
View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=6rd PKG_NAME:=6rd
PKG_VERSION:=7 PKG_VERSION:=8
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0
@ -19,7 +19,7 @@ define Package/6rd
CATEGORY:=Network CATEGORY:=Network
DEPENDS:=+kmod-ipv6 +kmod-sit DEPENDS:=+kmod-ipv6 +kmod-sit
TITLE:=6rd configuration support TITLE:=6rd configuration support
MAINTAINER:=Stéphan Kochen <stephan@kochen.nl> MAINTAINER:=Steven Barth <cyrus@openwrt.org>
PKGARCH:=all PKGARCH:=all
endef endef

2
package/network/ipv6/6rd/files/6rd.sh
View File

@ -23,7 +23,7 @@ proto_6rd_setup() {
return return
} }
( proto_add_host_dependency "$cfg" 0.0.0.0 ) ( proto_add_host_dependency "$cfg" 0.0.0.0 "$tunlink" )
[ -z "$ipaddr" ] && { [ -z "$ipaddr" ] && {
local wanif="$tunlink" local wanif="$tunlink"