hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <stefan.tomanek+openwrt@wertarbyte.de>

SVN-Revision: 44744
owl
John Crispin 2015-03-13 08:38:35 +00:00
parent 31b8de4587
commit fb60dd2ae6
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
package/network/services/dnsmasq/files/dnsmasq.init
View File

@ -364,12 +364,11 @@ dhcp_boot_add() {
[ -n "$filename" ] || return 0 [ -n "$filename" ] || return 0
config_get servername "$cfg" servername config_get servername "$cfg" servername
[ -n "$servername" ] || return 0
config_get serveraddress "$cfg" serveraddress 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 config_get_bool force "$cfg" force 0