domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dnsmasq: fix jail mount in case of ignore_hosts_dir being set

Browse Source 
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>
This commit is contained in:
Daniel Golle
2021-11-01 11:59:46 +00:00
parent d7843fd7ef
commit a44e4aaef9
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
package/network/services/dnsmasq/files/dnsmasq.init
View File

@@ -961,8 +961,8 @@ dnsmasq_start()
xappend "--addn-hosts=$HOSTFILE" xappend "--addn-hosts=$HOSTFILE"
append EXTRA_MOUNT "$HOSTFILE" append EXTRA_MOUNT "$HOSTFILE"
else else
xappend "--addn-hosts=$(dirname $HOSTFILE)" xappend "--addn-hosts=$HOSTFILE_DIR"
append EXTRA_MOUNT "$(dirname $HOSTFILE)" append EXTRA_MOUNT "$HOSTFILE_DIR"
fi fi
config_list_foreach "$cfg" "addnhosts" append_addnhosts config_list_foreach "$cfg" "addnhosts" append_addnhosts
config_list_foreach "$cfg" "bogusnxdomain" append_bogusnxdomain 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 $EXTRA_MOUNT $RFC6761FILE $TRUSTANCHORSFILE
procd_add_jail_mount $dnsmasqconffile $dnsmasqconfdir $resolvdir $user_dhcpscript procd_add_jail_mount $dnsmasqconffile $dnsmasqconfdir $resolvdir $user_dhcpscript
procd_add_jail_mount /etc/passwd /etc/group /etc/TZ /etc/hosts /etc/ethers 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_add_jail_mount_rw /var/run/dnsmasq/ $leasefile
procd_close_instance procd_close_instance