Author: cyrus Date: 2014-11-08 13:27:41 +0100 (Sat, 08 Nov 2014) New Revision: 43215
Modified: branches/barrier_breaker/package/network/config/netifd/Makefile branches/barrier_breaker/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh Log: netifd: fix default ORO for 6rd Signed-off-by: Steven Barth <[email protected]> Modified: branches/barrier_breaker/package/network/config/netifd/Makefile =================================================================== --- branches/barrier_breaker/package/network/config/netifd/Makefile 2014-11-08 12:24:49 UTC (rev 43214) +++ branches/barrier_breaker/package/network/config/netifd/Makefile 2014-11-08 12:27:41 UTC (rev 43215) @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=netifd -PKG_VERSION:=2014-09-08 +PKG_VERSION:=2014-09-08.1 PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE_PROTO:=git Modified: branches/barrier_breaker/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh =================================================================== --- branches/barrier_breaker/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh 2014-11-08 12:24:49 UTC (rev 43214) +++ branches/barrier_breaker/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh 2014-11-08 12:27:41 UTC (rev 43215) @@ -39,7 +39,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" [ "$delegate" = "0" ] && proto_export "IFACE6RD_DELEGATE=0" _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
