aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2021-08-01 15:05:18 +0100
committerDaniel Golle <daniel@makrotopia.org>2021-08-02 21:42:46 +0100
commit4003eeab35cd3f256cd81bc0192bcb32d7628104 (patch)
tree817eae4080c45e1e2801871d729fecfc3563e7d6 /package
parent6ca34c5c0c8bc394093c7b4da015816d5ebfbe91 (diff)
downloadupstream-4003eeab35cd3f256cd81bc0192bcb32d7628104.tar.gz
upstream-4003eeab35cd3f256cd81bc0192bcb32d7628104.tar.bz2
upstream-4003eeab35cd3f256cd81bc0192bcb32d7628104.zip
dnsmasq: reset EXTRA_MOUNT in the right place
EXTRA_MOUNT variable should be reset in dnsmasq_start() rather than just once at the beginning of the script. Fixes: ac4e8aa2f8 ("dnsmasq: fix more dnsmasq jail issues") Reported-by: Hartmut Birr <e9hack@gmail.com> Signed-off-by: Daniel Golle <daniel@makrotopia.org> (cherry picked from commit ddc8d085f39dea998f59680fb556ca72d779a3b1)
Diffstat (limited to 'package')
-rw-r--r--package/network/services/dnsmasq/files/dnsmasq.init4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init
index fe2edcbb56..205bfb4cf6 100644
--- a/package/network/services/dnsmasq/files/dnsmasq.init
+++ b/package/network/services/dnsmasq/files/dnsmasq.init
@@ -10,7 +10,6 @@ ADD_LOCAL_DOMAIN=1
ADD_LOCAL_HOSTNAME=1
ADD_WAN_FQDN=0
ADD_LOCAL_FQDN=""
-EXTRA_MOUNT=""
BASECONFIGFILE="/var/etc/dnsmasq.conf"
BASEHOSTFILE="/tmp/hosts/dhcp"
@@ -818,9 +817,10 @@ dnsmasq_start()
config_get_bool disabled "$cfg" disabled 0
[ "$disabled" -gt 0 ] && return 0
- # reset list of DOMAINS and DNS servers (for each dnsmasq instance)
+ # reset list of DOMAINS, DNS servers and EXTRA mounts (for each dnsmasq instance)
DNS_SERVERS=""
DOMAIN=""
+ EXTRA_MOUNT=""
CONFIGFILE="${BASECONFIGFILE}.${cfg}"
CONFIGFILE_TMP="${CONFIGFILE}.$$"
HOSTFILE="${BASEHOSTFILE}.${cfg}"