From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 22 Nov 2009 11:52:08 +0000 (+0000)
Subject: dnsmasq: Set a list of addnhosts files. e.g. list 'addnhosts' '/var/etc/hosts.olsr... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5a485c411217b7bff06ed4282b6a95c6cfd8c4a6;p=openwrt%2Fstaging%2Fmans0n.git

dnsmasq: Set a list of addnhosts files. e.g. list 'addnhosts' '/var/etc/hosts.olsr' list 'addnhosts' '/var/etc/hosts.olsrv6' hosts.olsr for ipv4 and hosts.olsrv6 for ipv6 addresses. Signed-off-by: Patrick Grimm <patrick@lunatiki.de>

SVN-Revision: 18470
---

diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index dc083f4b65..f2f0c9677c 100644
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmasq
 PKG_VERSION:=2.50
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index ba1bf721dd..bc14aa6c41 100644
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -49,6 +49,10 @@ append_notinterface() {
 	append args "-I $1"
 }
 
+append_addnhosts() {
+	append args "-H $1"
+}
+
 dnsmasq() {
 	local cfg="$1"
 	append_bool "$cfg" authoritative "-K"
@@ -72,13 +76,13 @@ dnsmasq() {
 	append_parm "$cfg" port "-p"
 	append_parm "$cfg" ednspacket_max "-P"
 	append_parm "$cfg" dhcpleasemax "-X"
-	append_parm "$cfg" "addnhosts" "-H"
 	append_parm "$cfg" "queryport" "-Q"
 	append_parm "$cfg" "domain" "-s"
 	append_parm "$cfg" "local" "-S"
 	config_list_foreach "$cfg" "server" append_server
 	config_list_foreach "$cfg" "interface" append_interface
 	config_list_foreach "$cfg" "notinterface" append_notinterface
+	config_list_foreach "$cfg" "addnhosts" append_addnhosts
 	append_parm "$cfg" "leasefile" "-l"
 	append_parm "$cfg" "resolvfile" "-r"
 	append_parm "$cfg" "tftp_root" "--tftp-root"