Author: cyrus Date: 2014-11-08 13:24:49 +0100 (Sat, 08 Nov 2014) New Revision: 43214
Modified: trunk/package/network/config/netifd/Makefile trunk/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh Log: netifd: fix default ORO-setting for 6rd Signed-off-by: Steven Barth <[email protected]> Modified: trunk/package/network/config/netifd/Makefile =================================================================== --- trunk/package/network/config/netifd/Makefile 2014-11-08 12:18:58 UTC (rev 43213) +++ trunk/package/network/config/netifd/Makefile 2014-11-08 12:24:49 UTC (rev 43214) @@ -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 Modified: trunk/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh =================================================================== --- trunk/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh 2014-11-08 12:18:58 UTC (rev 43213) +++ trunk/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh 2014-11-08 12:24:49 UTC (rev 43214) @@ -40,7 +40,7 @@ [ "$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" _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
