X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/85e49e4898d55395c4dc6694280356f3d26f2748..ccf3bdc4a6309f23aa80e643b4b4c734ab4100ca:/package/dnsmasq/files/dnsmasq.init?ds=sidebyside diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init index de9b92d52..870414900 100644 --- a/package/dnsmasq/files/dnsmasq.init +++ b/package/dnsmasq/files/dnsmasq.init @@ -182,7 +182,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 @@ -193,7 +192,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" } @@ -227,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 ] || { - 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