diff options
| author | Steven Barth <steven@midlink.org> | 2014-01-17 14:00:09 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2014-01-17 14:00:09 +0000 |
| commit | 39ecf08d2d5377f8c02ba63d3deb135f76b4816b (patch) | |
| tree | 3ccd0b38e478421f9cafed417c8d7e0e329c0e41 | |
| parent | 00769bba6c0fbe3f862f1072c5dc46faca7bb593 (diff) | |
| download | master-187ad058-39ecf08d2d5377f8c02ba63d3deb135f76b4816b.tar.gz master-187ad058-39ecf08d2d5377f8c02ba63d3deb135f76b4816b.tar.bz2 master-187ad058-39ecf08d2d5377f8c02ba63d3deb135f76b4816b.zip | |
dnsmasq: add dnsmasq.d config folder & improve odhcpd coexistence
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39312 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/network/services/dnsmasq/files/dnsmasq.init | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init index 0ff987f69c..b5fb58c524 100644 --- a/package/network/services/dnsmasq/files/dnsmasq.init +++ b/package/network/services/dnsmasq/files/dnsmasq.init @@ -158,8 +158,9 @@ dnsmasq() { config_get hostsfile "$cfg" dhcphostsfile [ -e "$hostsfile" ] && xappend "--dhcp-hostsfile=$hostsfile" - mkdir -p /tmp/hosts + mkdir -p /tmp/hosts /tmp/dnsmasq.d xappend "--addn-hosts=/tmp/hosts" + xappend "--conf-dir=/tmp/dnsmasq.d" local rebind config_get_bool rebind "$cfg" rebind_protection 1 @@ -559,7 +560,12 @@ start_service() { config_foreach dhcp_srv_add srvhost config_foreach dhcp_mx_add mxhost echo >> $CONFIGFILE - config_foreach dhcp_add dhcp + + config_get odhcpd_is_active odhcpd maindhcp + if [ "$odhcpd_is_active" != "1" ]; then + config_foreach dhcp_add dhcp + fi + echo >> $CONFIGFILE config_foreach dhcp_cname_add cname echo >> $CONFIGFILE |