From: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Date: Fri, 10 May 2019 19:14:59 +0000 (+0100)
Subject: dnsmasq: use hostsdir instead of addn-hosts
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=d3de3086febecd87e586f2618fac60fa3f67187f;p=openwrt%2Fstaging%2Fldir.git

dnsmasq: use hostsdir instead of addn-hosts

dnsmasq will dynamically scan changes/additions to hosts in hostsdir whereas
addn-hosts needs a SIGHUP.

While here, tell the init script to use a hidden file whilst it builds
the hosts files so dnsmasq isn't constantly refreshing during startup.

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
---

diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init
index 916480f630..53c4ee9bce 100755
--- a/package/network/services/dnsmasq/files/dnsmasq.init
+++ b/package/network/services/dnsmasq/files/dnsmasq.init
@@ -909,8 +909,9 @@ dnsmasq_start()
 	CONFIGFILE="${BASECONFIGFILE}.${cfg}"
 	CONFIGFILE_TMP="${CONFIGFILE}.$$"
 	HOSTFILE="${BASEHOSTFILE}.${cfg}"
-	HOSTFILE_TMP="${HOSTFILE}.$$"
-	HOSTFILE_DIR="$(dirname "$HOSTFILE")"
+	HOSTFILE_NAME="$(basename ${HOSTFILE})"
+	HOSTFILE_DIR="$(dirname ${HOSTFILE})"
+	HOSTFILE_TMP="${HOSTFILE_DIR}.${HOSTFILE_NAME}.$$"
 	BASEDHCPSTAMPFILE_CFG="${BASEDHCPSTAMPFILE}.${cfg}"
 
 	# before we can call xappend
@@ -1050,8 +1051,8 @@ dnsmasq_start()
 		xappend "--addn-hosts=$HOSTFILE"
 		append EXTRA_MOUNT "$HOSTFILE"
 	else
-		xappend "--addn-hosts=$HOSTFILE_DIR"
-		append EXTRA_MOUNT "$HOSTFILE_DIR"
+		xappend "--hostsdir=$(dirname $HOSTFILE)"
+		append EXTRA_MOUNT "$(dirname $HOSTFILE)"
 	fi
 	config_list_foreach "$cfg" "addnhosts" append_addnhosts
 	config_list_foreach "$cfg" "bogusnxdomain" append_bogusnxdomain