aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2021-11-01 11:59:46 +0000
committerDaniel Golle <daniel@makrotopia.org>2021-11-01 12:02:24 +0000
commita44e4aaef9e5418929f0f3df6ee5ba5643c2751e (patch)
tree326bc6e6945372c6e44467755aec905b896e58d9
parentd7843fd7eff6911d5509bb60c94a2bb20d976c1e (diff)
downloadupstream-a44e4aaef9e5418929f0f3df6ee5ba5643c2751e.tar.gz
upstream-a44e4aaef9e5418929f0f3df6ee5ba5643c2751e.tar.bz2
upstream-a44e4aaef9e5418929f0f3df6ee5ba5643c2751e.zip
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@gmail.com> Fixes: a2fcd3900c ("dnsmasq: improve init script") Signed-off-by: Daniel Golle <daniel@makrotopia.org>
-rw-r--r--package/network/services/dnsmasq/files/dnsmasq.init5
1 files 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