Migrate rt2x00 to the compat-wireless version

[openwrt.git] / package / dnsmasq / files / dnsmasq.init

diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index 69f499a..1a24612 100644 (file)
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -23,7 +23,7 @@ append_bool() {
        local value="$3"
        local _loctmp
        config_get_bool _loctmp "$section" "$option"
        local value="$3"
        local _loctmp
        config_get_bool _loctmp "$section" "$option"

-       [ "$_loctmp" -gt 0 ] && append args "$3"
+       [ "$_loctmp" -gt 0 ] && append args "$value"

 }
 
 append_parm() {
 }
 
 append_parm() {


@@ -63,6 +63,9 @@ dnsmasq() {
        append_parm "$cfg" "local" "-S"
        append_parm "$cfg" "leasefile" "-l"
        append_parm "$cfg" "resolvfile" "-r"
        append_parm "$cfg" "local" "-S"
        append_parm "$cfg" "leasefile" "-l"
        append_parm "$cfg" "resolvfile" "-r"

+
+       config_get leasefile $cfg leasefile
+       [ -e "$leasefile" ] || touch "$leasefile"

 }
 
 dhcp_subscrid_add() {
 }
 
 dhcp_subscrid_add() {


@@ -188,7 +191,8 @@ dhcp_add() {
        [ static = "$proto" ] || return 0
 
        config_get ipaddr "$net" ipaddr
        [ static = "$proto" ] || return 0
 
        config_get ipaddr "$net" ipaddr

-       config_get netmask "$net" netmask
+       config_get netmask "$cfg" netmask
+       [ -n "$netmask" ] || config_get netmask "$net" netmask

 
        #check for an already active dhcp server on the interface, unless 'force' is set
        config_get_bool force "$cfg" force 0
 
        #check for an already active dhcp server on the interface, unless 'force' is set
        config_get_bool force "$cfg" force 0


@@ -230,7 +234,6 @@ dhcp_option_add() {
 start() {
        include /lib/network
        scan_interfaces
 start() {
        include /lib/network
        scan_interfaces

-       config_load /var/state/network

        config_load dhcp
 
        args=""
        config_load dhcp
 
        args=""