From: João Henriques Date: Sun, 18 Apr 2021 22:41:30 +0000 (+0100) Subject: dnsmasq: add ignore hosts dir to dnsmasq init script X-Git-Tag: v21.02.0~21 X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=da5fd910733c909ca800040c0def817d28a22e55;p=openwrt%2Fstaging%2Fhauke.git dnsmasq: add ignore hosts dir to dnsmasq init script When running multiple instances of dnsmasq, for example one being for the lan and another for a guest network, it might not be desirable to have the same dns names configured in both networks Signed-off-by: João Henriques (cherry picked from commit e8a5670122e04574fdb5855ecd63d18f317c5bfd) Signed-off-by: Daniel Golle --- diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init index 2620821638..97b72c2bbd 100644 --- a/package/network/services/dnsmasq/files/dnsmasq.init +++ b/package/network/services/dnsmasq/files/dnsmasq.init @@ -1020,7 +1020,12 @@ dnsmasq_start() xappend "--dhcp-broadcast=tag:needs-broadcast" - xappend "--addn-hosts=$(dirname $HOSTFILE)" + config_get_bool ignore_hosts_dir "$cfg" ignore_hosts_dir 0 + if [ "$ignore_hosts_dir" = "1" ]; then + xappend "--addn-hosts=$HOSTFILE" + else + xappend "--addn-hosts=$(dirname $HOSTFILE)" + fi config_get dnsmasqconfdir "$cfg" confdir "/tmp/dnsmasq.d" xappend "--conf-dir=$dnsmasqconfdir"