[openwrt/openwrt] dnsmasq: fix jail mount in case of ignore_hosts_dir being set

[LEDE Commits]

dangole pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/a44e4aaef9e5418929f0f3df6ee5ba5643c2751e

commit a44e4aaef9e5418929f0f3df6ee5ba5643c2751e
Author: Daniel Golle <daniel at makrotopia.org>
AuthorDate: Mon Nov 1 11:59:46 2021 +0000

    dnsmasq: fix jail mount in case of ignore_hosts_dir being set
    
    Commit a2fcd3900c ("dnsmasq: improve init script") broke the existing
    handling for hosts_dir. Remove the redundant mount again to fix it.
    
    Reported-by: Hartmut Birr <e9hack at gmail.com>
    Fixes: a2fcd3900c ("dnsmasq: improve init script")
    Signed-off-by: Daniel Golle <daniel at makrotopia.org>
---
 package/network/services/dnsmasq/files/dnsmasq.init | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init
index 19135af1c2..d32c6cc1a0 100644
--- a/package/network/services/dnsmasq/files/dnsmasq.init
+++ b/package/network/services/dnsmasq/files/dnsmasq.init
@@ -961,8 +961,8 @@ dnsmasq_start()
 		xappend "--addn-hosts=$HOSTFILE"
 		append EXTRA_MOUNT "$HOSTFILE"
 	else
-		xappend "--addn-hosts=$(dirname $HOSTFILE)"
-		append EXTRA_MOUNT "$(dirname $HOSTFILE)"
+		xappend "--addn-hosts=$HOSTFILE_DIR"
+		append EXTRA_MOUNT "$HOSTFILE_DIR"
 	fi
 	config_list_foreach "$cfg" "addnhosts" append_addnhosts
 	config_list_foreach "$cfg" "bogusnxdomain" append_bogusnxdomain
@@ -1156,7 +1156,6 @@ dnsmasq_start()
 	procd_add_jail_mount $EXTRA_MOUNT $RFC6761FILE $TRUSTANCHORSFILE
 	procd_add_jail_mount $dnsmasqconffile $dnsmasqconfdir $resolvdir $user_dhcpscript
 	procd_add_jail_mount /etc/passwd /etc/group /etc/TZ /etc/hosts /etc/ethers
-	[ "$HOSTFILE_DIR" != "/tmp" ] && procd_add_jail_mount "$HOSTFILE_DIR"
 	procd_add_jail_mount_rw /var/run/dnsmasq/ $leasefile
 
 	procd_close_instance