[package] dnsmasq: add more options for interface binding (#4900)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15172 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index 3599fa0..5fe1509 100644 (file)
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmasq
 PKG_VERSION:=2.47
 
 PKG_NAME:=dnsmasq
 PKG_VERSION:=2.47

-PKG_RELEASE:=2
+PKG_RELEASE:=3

 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq

diff --git a/package/dnsmasq/files/dhcp.conf b/package/dnsmasq/files/dhcp.conf
index 837be31..f34a0e9 100644 (file)
--- a/package/dnsmasq/files/dhcp.conf
+++ b/package/dnsmasq/files/dhcp.conf
@@ -12,6 +12,8 @@ config dnsmasq
        option leasefile        '/tmp/dhcp.leases'
        option resolvfile       '/tmp/resolv.conf.auto'
        #list server            '/mycompany.local/1.2.3.4'
        option leasefile        '/tmp/dhcp.leases'
        option resolvfile       '/tmp/resolv.conf.auto'
        #list server            '/mycompany.local/1.2.3.4'

+       #option nonwildcard     0
+       #option interfaces      ''

 
 config dhcp lan
        option interface        lan
 
 config dhcp lan
        option interface        lan

diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index 8704149..0b2f630 100644 (file)
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -57,6 +57,7 @@ dnsmasq() {
        append_bool "$cfg" boguspriv "-b"
        append_bool "$cfg" expandhosts "-E"
        append_bool "$cfg" enable_tftp "--enable-tftp"
        append_bool "$cfg" boguspriv "-b"
        append_bool "$cfg" expandhosts "-E"
        append_bool "$cfg" enable_tftp "--enable-tftp"

+       append_bool "$cfg" nonwildcard "-z"

 
        append_parm "$cfg" dnsforwardmax "-0"
        append_parm "$cfg" port "-p"
 
        append_parm "$cfg" dnsforwardmax "-0"
        append_parm "$cfg" port "-p"


@@ -71,6 +72,7 @@ dnsmasq() {
        append_parm "$cfg" "resolvfile" "-r"
        append_parm "$cfg" "tftp_root" "--tftp-root"
        append_parm "$cfg" "dhcp_boot" "--dhcp-boot"
        append_parm "$cfg" "resolvfile" "-r"
        append_parm "$cfg" "tftp_root" "--tftp-root"
        append_parm "$cfg" "dhcp_boot" "--dhcp-boot"

+       append_parm "$cfg" "interfaces" "-i"

 
        config_get leasefile $cfg leasefile
        [ -e "$leasefile" ] || touch "$leasefile"
 
        config_get leasefile $cfg leasefile
        [ -e "$leasefile" ] || touch "$leasefile"