[source] dnsmasq: Specify directory /tmp/hosts as argument for --addn-hosts

LEDE Commits lede-commits at lists.infradead.org
Tue Dec 13 14:33:50 PST 2016


dedeckeh pushed a commit to source.git, branch master:
https://git.lede-project.org/942904f7b9363f231a9623d7d5501ae0cc7184d2

commit 942904f7b9363f231a9623d7d5501ae0cc7184d2
Author: Hans Dedecker <dedeckeh at gmail.com>
AuthorDate: Tue Dec 13 14:18:31 2016 +0100

    dnsmasq: Specify directory /tmp/hosts as argument for --addn-hosts
    
    Let dnsmasq read all hosts files in /tmp/hosts directory by specifying
    /tmp/hosts as argument of --addn-host
    
    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 861cda7..f5c665b 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.76
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 
 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 eebf5c7..67808d5 100644
--- a/package/network/services/dnsmasq/files/dnsmasq.init
+++ b/package/network/services/dnsmasq/files/dnsmasq.init
@@ -670,7 +670,7 @@ dnsmasq_start()
 
 	xappend "--dhcp-broadcast=tag:needs-broadcast"
 
-	xappend "--addn-hosts=$HOSTFILE"
+	xappend "--addn-hosts=$(dirname $HOSTFILE)"
 
 	config_get dnsmasqconfdir "$cfg" confdir "/tmp/dnsmasq.d"
 	[ ! -d "$dnsmasqconfdir" ] && mkdir -p $dnsmasqconfdir



More information about the lede-commits mailing list