caskd/openwrt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dnsmasq: make /tmp/dnsmasq.d and /tmp/hosts preferred over UCI settings

Browse Source 
Signed-off-by: Steven Barth <steven@midlink.org>

SVN-Revision: 46770
This commit is contained in:
Steven Barth 2015-09-02 11:49:00 +00:00
parent a0d06f65ae
commit fc41846248
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/network/services/dnsmasq/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=dnsmasq PKG_NAME:=dnsmasq
PKG_VERSION:=2.75 PKG_VERSION:=2.75
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq

8
package/network/services/dnsmasq/files/dnsmasq.init
View File

@ -176,10 +176,6 @@ dnsmasq() {
config_get hostsfile "$cfg" dhcphostsfile config_get hostsfile "$cfg" dhcphostsfile
[ -e "$hostsfile" ] && xappend "--dhcp-hostsfile=$hostsfile" [ -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 local rebind
config_get_bool rebind "$cfg" rebind_protection 1 config_get_bool rebind "$cfg" rebind_protection 1
[ $rebind -gt 0 ] && { [ $rebind -gt 0 ] && {
@ -215,6 +211,10 @@ dnsmasq() {
xappend "--dhcp-broadcast=tag:needs-broadcast" 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 echo >> $CONFIGFILE
} }