mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2024-12-16 11:54:48 +00:00
dnsmasq: add dnsmasq.d config folder & improve odhcpd coexistence
SVN-Revision: 39312
This commit is contained in:
parent
140a5b22d9
commit
9ec0e5df14
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user