Author: cyrus Date: 2015-09-02 13:49:00 +0200 (Wed, 02 Sep 2015) New Revision: 46770
Modified: trunk/package/network/services/dnsmasq/Makefile trunk/package/network/services/dnsmasq/files/dnsmasq.init Log: dnsmasq: make /tmp/dnsmasq.d and /tmp/hosts preferred over UCI settings Signed-off-by: Steven Barth <[email protected]> Modified: trunk/package/network/services/dnsmasq/Makefile =================================================================== --- trunk/package/network/services/dnsmasq/Makefile 2015-09-02 11:48:57 UTC (rev 46769) +++ trunk/package/network/services/dnsmasq/Makefile 2015-09-02 11:49:00 UTC (rev 46770) @@ -9,7 +9,7 @@ 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 Modified: trunk/package/network/services/dnsmasq/files/dnsmasq.init =================================================================== --- trunk/package/network/services/dnsmasq/files/dnsmasq.init 2015-09-02 11:48:57 UTC (rev 46769) +++ trunk/package/network/services/dnsmasq/files/dnsmasq.init 2015-09-02 11:49:00 UTC (rev 46770) @@ -176,10 +176,6 @@ 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 @@ 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 } _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
