diff options
| author | Steven Barth <steven@midlink.org> | 2014-08-19 05:58:44 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2014-08-19 05:58:44 +0000 |
| commit | bb96082ca09e42fb3a3c0261629a4117d4a22e3e (patch) | |
| tree | 3cd374943b82fb3d3cb009da2e41ac7052702525 | |
| parent | c41d5581c190d6feba0232a32bc99e8a3d307555 (diff) | |
| download | upstream-bb96082ca09e42fb3a3c0261629a4117d4a22e3e.tar.gz upstream-bb96082ca09e42fb3a3c0261629a4117d4a22e3e.tar.bz2 upstream-bb96082ca09e42fb3a3c0261629a4117d4a22e3e.zip | |
dnsmasq: respect option dhcpv4 disabled in dhcp-config
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42216 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/network/services/dnsmasq/files/dnsmasq.init | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init index 815f424a66..2ea73af947 100644 --- a/package/network/services/dnsmasq/files/dnsmasq.init +++ b/package/network/services/dnsmasq/files/dnsmasq.init @@ -373,6 +373,9 @@ dhcp_add() { 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" |