From: Hans Dedecker Date: Thu, 24 May 2018 08:27:07 +0000 (+0200) Subject: Revert "dnsmasq: use "hostsdir" instead of "addn-hosts"" X-Git-Tag: v18.06.0-rc1~166 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=fdeba0e0efd5ce60baf1103d99f3c15a803e9ef8;p=openwrt%2Fopenwrt.git Revert "dnsmasq: use "hostsdir" instead of "addn-hosts"" This reverts commit c97189e26dfb9b0eaf5b9cd7e33a99e2f780cb58 as it has different issues: -Host file is not written in a directory unique per dnsmasq instance -odhcpd writes host info into the same directory but still sends a SIGHUP to dnsmasq Signed-off-by: Hans Dedecker --- diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init index 24455ee7d9..2c71a777c3 100644 --- a/package/network/services/dnsmasq/files/dnsmasq.init +++ b/package/network/services/dnsmasq/files/dnsmasq.init @@ -938,7 +938,7 @@ dnsmasq_start() xappend "--dhcp-broadcast=tag:needs-broadcast" - xappend "--hostsdir=$(dirname $HOSTFILE)" + xappend "--addn-hosts=$(dirname $HOSTFILE)" config_get dnsmasqconfdir "$cfg" confdir "/tmp/dnsmasq.d" [ ! -d "$dnsmasqconfdir" ] && mkdir -p $dnsmasqconfdir