From: cyrus Date: Sat, 8 Nov 2014 12:24:49 +0000 (+0000) Subject: netifd: fix default ORO-setting for 6rd X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=36433642ac33e20da3097cc2fbc0258b9ee17406;p=openwrt.git netifd: fix default ORO-setting for 6rd Signed-off-by: Steven Barth git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43214 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- 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"