[ar71xx] aw-nr580: add support for the LAN ports

[openwrt.git] / package / dnsmasq / files / dnsmasq.init

diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index 7d32be0..8704149 100644 (file)
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -36,6 +36,10 @@ append_parm() {
        append args "$switch $_loctmp"
 }
 
        append args "$switch $_loctmp"
 }
 

+append_server() {
+       append args "-S $1"
+}
+

 dnsmasq() {
        local cfg="$1"
        append_bool "$cfg" authoritative "-K"
 dnsmasq() {
        local cfg="$1"
        append_bool "$cfg" authoritative "-K"


@@ -62,6 +66,7 @@ dnsmasq() {
        append_parm "$cfg" "queryport" "-Q"
        append_parm "$cfg" "domain" "-s"
        append_parm "$cfg" "local" "-S"
        append_parm "$cfg" "queryport" "-Q"
        append_parm "$cfg" "domain" "-s"
        append_parm "$cfg" "local" "-S"

+       config_list_foreach "$cfg" "server" append_server

        append_parm "$cfg" "leasefile" "-l"
        append_parm "$cfg" "resolvfile" "-r"
        append_parm "$cfg" "tftp_root" "--tftp-root"
        append_parm "$cfg" "leasefile" "-l"
        append_parm "$cfg" "resolvfile" "-r"
        append_parm "$cfg" "tftp_root" "--tftp-root"


@@ -177,7 +182,6 @@ dhcp_boot_add() {
        local cfg="$1"
 
        config_get name "$cfg" name
        local cfg="$1"
 
        config_get name "$cfg" name

-       [ -n "$name" ] || return 0

 
        config_get filename "$cfg" filename
        [ -n "$filename" ] || return 0
 
        config_get filename "$cfg" filename
        [ -n "$filename" ] || return 0


@@ -188,7 +192,7 @@ dhcp_boot_add() {
        config_get serveraddress "$cfg" serveraddress
        [ -n "$serveraddress" ] || return 0
 
        config_get serveraddress "$cfg" serveraddress
        [ -n "$serveraddress" ] || return 0
 

-       append args "--dhcp-boot=net:$name,$filename,$servername,$serveraddress"
+       append args "--dhcp-boot=${name:+net:$name,}$filename,$servername,$serveraddress"

 
        dhcp_option_add "$cfg" "$name"
 }
 
        dhcp_option_add "$cfg" "$name"
 }


@@ -222,7 +226,7 @@ dhcp_add() {
        #check for an already active dhcp server on the interface, unless 'force' is set
        config_get_bool force "$cfg" force 0
        [ "$force" -gt 0 ] || {
        #check for an already active dhcp server on the interface, unless 'force' is set
        config_get_bool force "$cfg" force 0
        [ "$force" -gt 0 ] || {

-               udhcpc -n -q -R -s /bin/true -t 1 -i $ifname >&- && return 0
+               udhcpc -n -q -s /bin/true -t 1 -i $ifname >&- && return 0

        }
 
        config_get start "$cfg" start
        }
 
        config_get start "$cfg" start