aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Dedecker <dedeckeh@gmail.com>2017-06-14 22:50:48 +0200
committerHans Dedecker <dedeckeh@gmail.com>2017-06-14 22:51:08 +0200
commit8180bbac7c237a31bd6e06c63e342c72342b7303 (patch)
tree2dccbf7c0e3f9b5125f540ddd321441dd6ab9f95
parenta3332f2aa2d2d3fb6fcd92a49f60bcae0dbd988e (diff)
downloadupstream-8180bbac7c237a31bd6e06c63e342c72342b7303.tar.gz
upstream-8180bbac7c237a31bd6e06c63e342c72342b7303.tar.bz2
upstream-8180bbac7c237a31bd6e06c63e342c72342b7303.zip
Revert "dnsmasq: manage resolv.conf if when listening on 127.0.0.1#53"
This reverts commit a53f8ba6771de64c9c82a2e6867791226f3003cb. Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
-rw-r--r--package/network/services/dnsmasq/Makefile2
-rw-r--r--package/network/services/dnsmasq/files/dnsmasq.init60
2 files changed, 26 insertions, 36 deletions
diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile
index 35ac6b2891..f9ab13aef0 100644
--- a/package/network/services/dnsmasq/Makefile
+++ b/package/network/services/dnsmasq/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=dnsmasq
PKG_VERSION:=2.77
-PKG_RELEASE:=4
+PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq/
diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init
index fda11401db..d5177ecb0c 100644
--- a/package/network/services/dnsmasq/files/dnsmasq.init
+++ b/package/network/services/dnsmasq/files/dnsmasq.init
@@ -707,21 +707,6 @@ dhcp_relay_add() {
fi
}
-dnsmasq_ismain()
-{
- local cfg="$1"
- local port notinterfaces
-
- config_get port "$cfg" port "53"
- [ $port = "53" ] || return 1
-
- config_get notinterfaces "$cfg" notinterface ""
- [ -n $notinterfaces ] && list_contains $notinterfaces "loopback" || return 1
-
- # dnsmasq instance is designated to listen on 127.0.0.1#53.
- return 0
-}
-
dnsmasq_start()
{
local cfg="$1" disabled resolvfile user_dhcpscript
@@ -868,10 +853,14 @@ dnsmasq_start()
[ -n "$leasefile" -a \! -e "$leasefile" ] && touch "$leasefile"
config_get_bool cachelocal "$cfg" cachelocal 1
- config_get resolvfile "$cfg" resolvfile "/tmp/resolv.conf.auto"
- xappend "--resolv-file=$resolvfile"
- # So jail doesn't complain if file missing
- [ \! -e "$resolvfile" ] && touch "$resolvfile"
+ config_get_bool noresolv "$cfg" noresolv 0
+ if [ "$noresolv" != "1" ]; then
+ config_get resolvfile "$cfg" resolvfile "/tmp/resolv.conf.auto"
+ # So jail doesn't complain if file missing
+ [ -n "$resolvfile" -a \! -e "$resolvfile" ] && touch "$resolvfile"
+ fi
+
+ [ -n "$resolvfile" ] && xappend "--resolv-file=$resolvfile"
config_get hostsfile "$cfg" dhcphostsfile
[ -e "$hostsfile" ] && xappend "--dhcp-hostsfile=$hostsfile"
@@ -984,6 +973,16 @@ dnsmasq_start()
echo >> $CONFIGFILE_TMP
mv -f $CONFIGFILE_TMP $CONFIGFILE
+ [ "$resolvfile" = "/tmp/resolv.conf.auto" ] && {
+ rm -f /tmp/resolv.conf
+ [ $ADD_LOCAL_DOMAIN -eq 1 ] && [ -n "$DOMAIN" ] && {
+ echo "search $DOMAIN" >> /tmp/resolv.conf
+ }
+ DNS_SERVERS="$DNS_SERVERS 127.0.0.1"
+ for DNS_SERVER in $DNS_SERVERS ; do
+ echo "nameserver $DNS_SERVER" >> /tmp/resolv.conf
+ done
+ }
procd_open_instance $cfg
procd_set_param command $PROG -C $CONFIGFILE -k -x /var/run/dnsmasq/dnsmasq."${cfg}".pid
@@ -1001,29 +1000,20 @@ dnsmasq_start()
procd_add_jail_mount_rw /var/run/dnsmasq/ $leasefile
procd_close_instance
-
-
- # write /tmp/resolve.conf only for main instance
- dnsmasq_ismain $cfg && {
- rm -f /tmp/resolv.conf
- [ $ADD_LOCAL_DOMAIN -eq 1 ] && [ -n "$DOMAIN" ] && {
- echo "search $DOMAIN" >> /tmp/resolv.conf
- }
- DNS_SERVERS="$DNS_SERVERS 127.0.0.1"
- for DNS_SERVER in $DNS_SERVERS ; do
- echo "nameserver $DNS_SERVER" >> /tmp/resolv.conf
- done
- }
}
dnsmasq_stop()
{
local cfg="$1"
+ config_get resolvfile "$cfg" "resolvfile"
+
#relink /tmp/resolve.conf only for main instance
- dnsmasq_ismain $cfg && {
- [ -f /tmp/resolv.conf ] && rm -f /tmp/resolv.conf
- ln -s /tmp/resolv.conf.auto /tmp/resolv.conf
+ [ "$resolvfile" = "/tmp/resolv.conf.auto" ] && {
+ [ -f /tmp/resolv.conf ] && {
+ rm -f /tmp/resolv.conf
+ ln -s "$resolvfile" /tmp/resolv.conf
+ }
}
rm -f ${BASEDHCPSTAMPFILE}.${cfg}.*.dhcp