caskd/openwrt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dnsmasq: add dnsmasq.d config folder & improve odhcpd coexistence

Browse Source 
SVN-Revision: 39312
This commit is contained in:
Steven Barth 2014-01-17 14:00:09 +00:00
parent 140a5b22d9
commit 9ec0e5df14
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
package/network/services/dnsmasq/files/dnsmasq.init
View File

@ -158,8 +158,9 @@ dnsmasq() {
config_get hostsfile "$cfg" dhcphostsfile config_get hostsfile "$cfg" dhcphostsfile
[ -e "$hostsfile" ] && xappend "--dhcp-hostsfile=$hostsfile" [ -e "$hostsfile" ] && xappend "--dhcp-hostsfile=$hostsfile"
mkdir -p /tmp/hosts mkdir -p /tmp/hosts /tmp/dnsmasq.d
xappend "--addn-hosts=/tmp/hosts" xappend "--addn-hosts=/tmp/hosts"
xappend "--conf-dir=/tmp/dnsmasq.d"
local rebind local rebind
config_get_bool rebind "$cfg" rebind_protection 1 config_get_bool rebind "$cfg" rebind_protection 1
@ -559,7 +560,12 @@ start_service() {
config_foreach dhcp_srv_add srvhost config_foreach dhcp_srv_add srvhost
config_foreach dhcp_mx_add mxhost config_foreach dhcp_mx_add mxhost
echo >> $CONFIGFILE 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 echo >> $CONFIGFILE
config_foreach dhcp_cname_add cname config_foreach dhcp_cname_add cname
echo >> $CONFIGFILE echo >> $CONFIGFILE