diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2015-01-16 19:04:19 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2015-01-16 19:04:19 +0000 |
| commit | 7e0c58ce3dfe4c69f285d1f3177bb9ea2b0bf93a (patch) | |
| tree | d83559100f3d9d1d3a7aa335eb6052766df02f89 /package | |
| parent | 2967c8a90109ca6531686a96bb73b5b2141cb698 (diff) | |
| download | upstream-7e0c58ce3dfe4c69f285d1f3177bb9ea2b0bf93a.tar.gz upstream-7e0c58ce3dfe4c69f285d1f3177bb9ea2b0bf93a.tar.bz2 upstream-7e0c58ce3dfe4c69f285d1f3177bb9ea2b0bf93a.zip | |
dnsmasq: support and use local-service by default (#14951)
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43982 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
| -rw-r--r-- | package/network/services/dnsmasq/Makefile | 4 | ||||
| -rw-r--r-- | package/network/services/dnsmasq/files/dhcp.conf | 1 | ||||
| -rw-r--r-- | package/network/services/dnsmasq/files/dnsmasq.init | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile index 766aaf04ec..dcbb63a0f3 100644 --- a/package/network/services/dnsmasq/Makefile +++ b/package/network/services/dnsmasq/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2014 OpenWrt.org +# Copyright (C) 2006-2015 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq PKG_VERSION:=2.72 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq diff --git a/package/network/services/dnsmasq/files/dhcp.conf b/package/network/services/dnsmasq/files/dhcp.conf index 660b06ad4f..a6e7867ca7 100644 --- a/package/network/services/dnsmasq/files/dhcp.conf +++ b/package/network/services/dnsmasq/files/dhcp.conf @@ -19,6 +19,7 @@ config dnsmasq #list interface br-lan #list notinterface lo #list bogusnxdomain '64.94.110.11' + option localservice 1 # disable to allow DNS requests from non-loclal subnets config dhcp lan option interface lan diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init index 209952b5e6..cb78e831d3 100644 --- a/package/network/services/dnsmasq/files/dnsmasq.init +++ b/package/network/services/dnsmasq/files/dnsmasq.init @@ -127,6 +127,7 @@ dnsmasq() { append_bool "$cfg" nonwildcard "--bind-interfaces" append_bool "$cfg" fqdn "--dhcp-fqdn" append_bool "$cfg" proxydnssec "--proxy-dnssec" + append_bool "$cfg" localservice "--local-service" append_parm "$cfg" dhcpscript "--dhcp-script" append_parm "$cfg" cachesize "--cache-size" |