From: Hans Dedecker <dedeckeh@gmail.com>
Date: Sat, 24 Mar 2018 17:28:01 +0000 (+0100)
Subject: dnsmasq: improve init script portability (FS#1446)
X-Git-Tag: v18.06.0-rc1~542
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=287f5ebd2fe4fac6632819a1b539f119551407e8;p=openwrt%2Fstaging%2Fpepe2k.git

dnsmasq: improve init script portability (FS#1446)

Improve portability of init script by declaring resolvfile as local
in dnsmasq_stop function.
Fixes resolvfile being set for older busybox versions in dnsmasq_start
in a multi dnsmasq instance config when doing restart; this happens when
the last instance has a resolvfile configured while the first instance
being started has noresolv set to 1.

Base on a patch by "Phil"

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
---

diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile
index 66d6641804..6a5cad140e 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.79
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 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 dcc18e34d7..1881b2bcdc 100644
--- a/package/network/services/dnsmasq/files/dnsmasq.init
+++ b/package/network/services/dnsmasq/files/dnsmasq.init
@@ -1027,7 +1027,7 @@ dnsmasq_start()
 
 dnsmasq_stop()
 {
-	local cfg="$1"
+	local cfg="$1" resolvfile
 
 	config_get resolvfile "$cfg" "resolvfile"