aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2013-05-24 15:11:24 +0000
committerSteven Barth <steven@midlink.org>2013-05-24 15:11:24 +0000
commit1e5bdfb274c8b4dde3647968d5a9ac4053308366 (patch)
treef1613a1d25769a37c05fe2ab262338524c90246e
parenta81d320b04370e6fa6809a3dca19adda01ef0bbf (diff)
downloadupstream-1e5bdfb274c8b4dde3647968d5a9ac4053308366.tar.gz
upstream-1e5bdfb274c8b4dde3647968d5a9ac4053308366.tar.bz2
upstream-1e5bdfb274c8b4dde3647968d5a9ac4053308366.zip
AA: backport r36655 from trunk
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@36715 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/dnsmasq/Makefile2
-rw-r--r--package/dnsmasq/files/dnsmasq.init3
2 files changed, 4 insertions, 1 deletions
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 ] && {