From: Steven Barth <cyrus@openwrt.org>
Date: Fri, 24 May 2013 15:11:24 +0000 (+0000)
Subject: AA: backport r36655 from trunk
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9b78d79533fa0b81f4d622f20b89e4ebbc824198;p=openwrt%2Fsvn-archive%2Fopenwrt.git

AA: backport r36655 from trunk

SVN-Revision: 36715
---

diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index 4ad0f37742..baa48d579e 100644
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmasq
 PKG_VERSION:=2.62
-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 85c22c3745..5d5d97fe04 100644
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -133,6 +133,9 @@ dnsmasq() {
 	config_get hostsfile "$cfg" dhcphostsfile
 	[ -e "$hostsfile" ] && xappend "--dhcp-hostsfile=$hostsfile"
 
+	mkdir -p /tmp/hosts
+	xappend "--addn-hosts=/tmp/hosts"
+
 	local rebind
 	config_get_bool rebind "$cfg" rebind_protection 1
 	[ $rebind -gt 0 ] && {