dnsmasq: Make parameters optional in dhcpboot config
authorJohn Crispin <john@openwrt.org>
Fri, 13 Mar 2015 08:38:35 +0000 (08:38 +0000)
committerJohn Crispin <john@openwrt.org>
Fri, 13 Mar 2015 08:38:35 +0000 (08:38 +0000)
The --dhcp-boot option of dnsmasq does not require servername and serveraddress
arguments if the builtin tftp server is used.

Signed-off-by: Stefan Tomanek <stefan.tomanek+openwrt@wertarbyte.de>
SVN-Revision: 44744

package/network/services/dnsmasq/files/dnsmasq.init

index 40ec584..fb118d5 100644 (file)
@@ -364,12 +364,11 @@ dhcp_boot_add() {
        [ -n "$filename" ] || return 0
 
        config_get servername "$cfg" servername
-       [ -n "$servername" ] || return 0
-
        config_get serveraddress "$cfg" serveraddress
-       [ -n "$serveraddress" ] || return 0
 
-       xappend "--dhcp-boot=${networkid:+net:$networkid,}$filename,$servername,$serveraddress"
+       [ -n "$serveraddress" -a ! -n "$servername" ] && return 0
+
+       xappend "--dhcp-boot=${networkid:+net:$networkid,}${filename}${servername:+,$servername}${serveraddress:+,$serveraddress}"
 
        config_get_bool force "$cfg" force 0