[openwrt/openwrt] dnsmasq: improve init script portability (FS#1446)

LEDE Commits lede-commits at lists.infradead.org
Sat Mar 24 10:55:39 PDT 2018


dedeckeh pushed a commit to openwrt/openwrt.git, branch master:
https://git.lede-project.org/287f5ebd2fe4fac6632819a1b539f119551407e8

commit 287f5ebd2fe4fac6632819a1b539f119551407e8
Author: Hans Dedecker <dedeckeh at gmail.com>
AuthorDate: Sat Mar 24 18:28:01 2018 +0100

    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 at gmail.com>
---
 package/network/services/dnsmasq/Makefile           | 2 +-
 package/network/services/dnsmasq/files/dnsmasq.init | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile
index 66d6641..6a5cad1 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 dcc18e3..1881b2b 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"
 



More information about the lede-commits mailing list