Changeset 44744


Ignore:
Timestamp:
2015-03-13T09:38:35+01:00 (3 years ago)
Author:
blogic
Message:

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@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/network/services/dnsmasq/files/dnsmasq.init

    r44006 r44744  
    365365 
    366366        config_get servername "$cfg" servername 
    367         [ -n "$servername" ] || return 0 
    368  
    369367        config_get serveraddress "$cfg" serveraddress 
    370         [ -n "$serveraddress" ] || return 0 
    371  
    372         xappend "--dhcp-boot=${networkid:+net:$networkid,}$filename,$servername,$serveraddress" 
     368 
     369        [ -n "$serveraddress" -a ! -n "$servername" ] && return 0 
     370 
     371        xappend "--dhcp-boot=${networkid:+net:$networkid,}${filename}${servername:+,$servername}${serveraddress:+,$serveraddress}" 
    373372 
    374373        config_get_bool force "$cfg" force 0 
Note: See TracChangeset for help on using the changeset viewer.