From: Hans Dedecker Date: Thu, 24 May 2018 08:11:20 +0000 (+0200) Subject: Revert "dnsmasq: use "hostsdir" instead of "addn-hosts"" X-Git-Tag: v19.07.0-rc1~3621 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bcf20e05832aa8b00ab4b5e67a112d7910cca2d0;p=oweals%2Fopenwrt.git Revert "dnsmasq: use "hostsdir" instead of "addn-hosts"" This reverts commit a03035dad198cd4b51645ceb43c1170f9cf95f16 as it has several issues: -Host file is located in a directory which is not 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