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

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

diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index 4fddc4723289d10854c7f61ad7bbfc60f838d023..0b2f6303904ad1ef3102a350112d495f7714db52 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_server() {
+       append args "-S $1"
+}
+
 dnsmasq() {
        local cfg="$1"
        append_bool "$cfg" authoritative "-K"
@@ -52,6 +56,8 @@ dnsmasq() {
        append_bool "$cfg" dbus "-1"
        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"
@@ -61,8 +67,12 @@ dnsmasq() {
        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" "dhcp_boot" "--dhcp-boot"
+       append_parm "$cfg" "interfaces" "-i"
 
        config_get leasefile $cfg leasefile
        [ -e "$leasefile" ] || touch "$leasefile"
@@ -174,7 +184,6 @@ dhcp_boot_add() {
        local cfg="$1"
 
        config_get name "$cfg" name
-       [ -n "$name" ] || return 0
 
        config_get filename "$cfg" filename
        [ -n "$filename" ] || return 0
@@ -185,7 +194,7 @@ dhcp_boot_add() {
        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"
 }
@@ -219,7 +228,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 ] || {
-               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