diff options
| author | Steven Barth <steven@midlink.org> | 2014-11-08 12:24:49 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2014-11-08 12:24:49 +0000 |
| commit | a5818dc8148d84cd219cba56227adac533b8d762 (patch) | |
| tree | 0f598a268f8748922c62467ded2177048802bb45 /package | |
| parent | a7621a43d3a15d6a5d25094363f065d05d108978 (diff) | |
| download | upstream-a5818dc8148d84cd219cba56227adac533b8d762.tar.gz upstream-a5818dc8148d84cd219cba56227adac533b8d762.tar.bz2 upstream-a5818dc8148d84cd219cba56227adac533b8d762.zip | |
netifd: fix default ORO-setting for 6rd
Signed-off-by: Steven Barth <steven@midlink.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43214 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
| -rw-r--r-- | package/network/config/netifd/Makefile | 2 | ||||
| -rwxr-xr-x | package/network/config/netifd/files/lib/netifd/proto/dhcp.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile index 008af6183d..ea8980f4bb 100644 --- a/package/network/config/netifd/Makefile +++ b/package/network/config/netifd/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=netifd -PKG_VERSION:=2014-10-24 +PKG_VERSION:=2014-10-24.1 PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE_PROTO:=git diff --git a/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh b/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh index 6668b49c21..d4c483d690 100755 --- a/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh +++ b/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh @@ -40,7 +40,7 @@ proto_dhcp_setup() { [ "$broadcast" = 1 ] && broadcast="-B" || broadcast= [ -n "$clientid" ] && clientid="-x 0x3d:${clientid//:/}" || clientid="-C" [ -n "$iface6rd" ] && proto_export "IFACE6RD=$iface6rd" - [ -n "$iface6rd" ] && append dhcpopts "-O 212" + [ "$iface6rd" != 0 -a -f /lib/netifd/proto/6rd.sh ] && append dhcpopts "-O 212" [ -n "$zone6rd" ] && proto_export "ZONE6RD=$zone6rd" [ -n "$zone" ] && proto_export "ZONE=$zone" [ -n "$mtu6rd" ] && proto_export "MTU6RD=$mtu6rd" |