Author: cyrus
Date: 2014-08-19 08:00:07 +0200 (Tue, 19 Aug 2014)
New Revision: 42218
Modified:
branches/barrier_breaker/package/network/services/dnsmasq/files/dnsmasq.init
Log:
dnsmasq: respect option dhcpv4 disabled in dhcp-config
Modified:
branches/barrier_breaker/package/network/services/dnsmasq/files/dnsmasq.init
===================================================================
---
branches/barrier_breaker/package/network/services/dnsmasq/files/dnsmasq.init
2014-08-19 05:58:51 UTC (rev 42217)
+++
branches/barrier_breaker/package/network/services/dnsmasq/files/dnsmasq.init
2014-08-19 06:00:07 UTC (rev 42218)
@@ -373,6 +373,9 @@
config_get net "$cfg" interface
[ -n "$net" ] || return 0
+ config_get dhcpv4 "$cfg" dhcpv4
+ [ "$dhcpv4" != "disabled" ] || return 0
+
config_get networkid "$cfg" networkid
[ -n "$networkid" ] || networkid="$net"
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
