From 211e31b353e6fbd15bb5bbe1786c13922a157496 Mon Sep 17 00:00:00 2001 From: cyrus Date: Wed, 2 Sep 2015 11:49:00 +0000 Subject: [PATCH] dnsmasq: make /tmp/dnsmasq.d and /tmp/hosts preferred over UCI settings Signed-off-by: Steven Barth git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46770 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/network/services/dnsmasq/Makefile | 2 +- package/network/services/dnsmasq/files/dnsmasq.init | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile index 444459baaa..864914effc 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.75 -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 ab64e88a93..1b42cff394 100644 --- a/package/network/services/dnsmasq/files/dnsmasq.init +++ b/package/network/services/dnsmasq/files/dnsmasq.init @@ -176,10 +176,6 @@ dnsmasq() { config_get hostsfile "$cfg" dhcphostsfile [ -e "$hostsfile" ] && xappend "--dhcp-hostsfile=$hostsfile" - mkdir -p /tmp/hosts /tmp/dnsmasq.d - xappend "--addn-hosts=/tmp/hosts" - xappend "--conf-dir=/tmp/dnsmasq.d" - local rebind config_get_bool rebind "$cfg" rebind_protection 1 [ $rebind -gt 0 ] && { @@ -215,6 +211,10 @@ dnsmasq() { xappend "--dhcp-broadcast=tag:needs-broadcast" + mkdir -p /tmp/hosts /tmp/dnsmasq.d + xappend "--addn-hosts=/tmp/hosts" + xappend "--conf-dir=/tmp/dnsmasq.d" + echo >> $CONFIGFILE } -- 2.11.0