From: Markus Wigge <mwigge@marcant.net>
Date: Tue, 5 May 2009 09:33:56 +0000 (+0000)
Subject: changed "option" to "list" for binding interfaces
X-Git-Tag: reboot~23724
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=807c0426bf899b25f82e9b6d6968f2bccc9eb6d9;p=openwrt%2Fstaging%2Flynxis.git

changed "option" to "list" for binding interfaces

SVN-Revision: 15613
---

diff --git a/package/dnsmasq/files/dhcp.conf b/package/dnsmasq/files/dhcp.conf
index f34a0e9158..85228974a1 100644
--- a/package/dnsmasq/files/dhcp.conf
+++ b/package/dnsmasq/files/dhcp.conf
@@ -13,7 +13,7 @@ config dnsmasq
 	option resolvfile	'/tmp/resolv.conf.auto'
 	#list server		'/mycompany.local/1.2.3.4'
 	#option nonwildcard	0
-	#option interfaces	''
+	#list interface		br-lan
 
 config dhcp lan
 	option interface	lan
diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index 0b2f630390..7a1530fdd3 100644
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -40,6 +40,10 @@ append_server() {
 	append args "-S $1"
 }
 
+append_interface() {
+	append args "-i $1"
+}
+
 dnsmasq() {
 	local cfg="$1"
 	append_bool "$cfg" authoritative "-K"
@@ -68,11 +72,11 @@ dnsmasq() {
 	append_parm "$cfg" "domain" "-s"
 	append_parm "$cfg" "local" "-S"
 	config_list_foreach "$cfg" "server" append_server
+	config_list_foreach "$cfg" "interface" append_interface
 	append_parm "$cfg" "leasefile" "-l"
 	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"