changed "option" to "list" for binding interfaces

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

diff --git a/package/dnsmasq/files/dhcp.conf b/package/dnsmasq/files/dhcp.conf
index f34a0e9..8522897 100644 (file)
--- 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 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
 
 config dhcp lan
        option interface        lan

diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index 0b2f630..7a1530f 100644 (file)
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -40,6 +40,10 @@ append_server() {
        append args "-S $1"
 }
 
        append args "-S $1"
 }
 

+append_interface() {
+       append args "-i $1"
+}
+

 dnsmasq() {
        local cfg="$1"
        append_bool "$cfg" authoritative "-K"
 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
        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" "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"
 
        config_get leasefile $cfg leasefile
        [ -e "$leasefile" ] || touch "$leasefile"