From: John Crispin Date: Fri, 13 Mar 2015 08:38:35 +0000 (+0000) Subject: dnsmasq: Make parameters optional in dhcpboot config X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=259ed0dac62b4881cab73d66faf9b68b5de8154b dnsmasq: Make parameters optional in dhcpboot config 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 SVN-Revision: 44744 --- diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init index 40ec584c1b..fb118d5756 100644 --- a/package/network/services/dnsmasq/files/dnsmasq.init +++ b/package/network/services/dnsmasq/files/dnsmasq.init @@ -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