Use a more explicit variable name for the number of dhcp leases (#2240)

[openwrt/svn-archive/archive.git] / package / dnsmasq / files / dnsmasq.init

diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index 52973d4ca051807200d62433c4ba538afbdb8ced..4d5b660aa50968c4b35cb8f9b23c848353a7b388 100644 (file)
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -40,23 +40,25 @@ 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 -i $ifname >&- && return 0
+               udhcpc -n -q -R -s /bin/true -t 1 -i $ifname >&- && return 0
        }
        
        config_get start "$cfg" start
-       config_get end "$cfg" end
+       config_get limit "$cfg" limit
        config_get leasetime "$cfg" leasetime
+       config_get options "$cfg" options
 
        leasetime="${leasetime:-12h}"
        start="$(dhcp_calc "${start:-100}")"
-       end="$((${end:-150} + 1))"
-       eval "$(ipcalc.sh $ipaddr $netmask $start $end)"
-       append args "-F $START,$END,$NETMASK,$leasetime"        
+       limit="$((${limit:-150} + 1))"
+       eval "$(ipcalc.sh $ipaddr $netmask $start $limit)"
+       append args "-F $START,$END,$NETMASK,$leasetime${options:+ $options}"
 }
 
 start() {
        include /lib/network
        scan_interfaces
+       config_load /var/state/network
        config_load dhcp
 
        args=""