lua: remove an unnecessary check and replace switch (GET_OPCODE(i)) as well (thx...

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

diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index 75b20df..60ffc8c 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() {


@@ -49,7 +49,7 @@ dnsmasq() {
        append_bool "$cfg" noresolv "-R"
        append_bool "$cfg" localise_queries "-y"
        append_bool "$cfg" readethers "-Z"
        append_bool "$cfg" noresolv "-R"
        append_bool "$cfg" localise_queries "-y"
        append_bool "$cfg" readethers "-Z"

-       append_bool "$cfg" dbus "-l"
+       append_bool "$cfg" dbus "-1"

        append_bool "$cfg" boguspriv "-b"
        append_bool "$cfg" expandhosts "-E"
 
        append_bool "$cfg" boguspriv "-b"
        append_bool "$cfg" expandhosts "-E"
 


@@ -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() {


@@ -166,6 +169,27 @@ dhcp_mac_add() {
        dhcp_option_add "$cfg" "$name"
 }
 
        dhcp_option_add "$cfg" "$name"
 }
 

+dhcp_boot_add() {
+       local cfg="$1"
+
+       config_get name "$cfg" name
+       [ -n "$name" ] || return 0
+
+       config_get filename "$cfg" filename
+       [ -n "$filename" ] || return 0
+
+       config_get servername "$cfg" servername
+       [ -n "$servername" ] || return 0
+
+       config_get serveraddress "$cfg" serveraddress
+       [ -n "$serveraddress" ] || return 0
+
+       append args "--dhcp-boot=net:$name,$filename,$servername,$serveraddress"
+
+       dhcp_option_add "$cfg" "$name"
+}
+
+

 dhcp_add() {
        local cfg="$1"
        config_get net "$cfg" interface
 dhcp_add() {
        local cfg="$1"
        config_get net "$cfg" interface


@@ -182,13 +206,14 @@ dhcp_add() {
                DNS_SERVERS="$DNS_SERVERS $dnsserver"
        }
 
                DNS_SERVERS="$DNS_SERVERS $dnsserver"
        }
 

-       append_bool "$cfg" ignore "-I $ifname"
+       append_bool "$cfg" ignore "-2 $ifname"

 
        config_get proto "$net" proto
        [ static = "$proto" ] || return 0
 
        config_get ipaddr "$net" ipaddr
 
        config_get proto "$net" proto
        [ 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


@@ -200,11 +225,13 @@ dhcp_add() {
        config_get limit "$cfg" limit
        config_get leasetime "$cfg" leasetime
        config_get options "$cfg" options
        config_get limit "$cfg" limit
        config_get leasetime "$cfg" leasetime
        config_get options "$cfg" options

+       config_get_bool dynamicdhcp "$cfg" dynamicdhcp 1

 
        leasetime="${leasetime:-12h}"
        start="$(dhcp_calc "${start:-100}")"
        limit="$((${limit:-150} + 1))"
        eval "$(ipcalc.sh $ipaddr $netmask $start $limit)"
 
        leasetime="${leasetime:-12h}"
        start="$(dhcp_calc "${start:-100}")"
        limit="$((${limit:-150} + 1))"
        eval "$(ipcalc.sh $ipaddr $netmask $start $limit)"

+       if [ "$dynamicdhcp" = "0" ]; then END="static"; fi

        append args "--dhcp-range=$name,$START,$END,$NETMASK,$leasetime${options:+ $options}"
 
        dhcp_option_add "$cfg" "$name"
        append args "--dhcp-range=$name,$START,$END,$NETMASK,$leasetime${options:+ $options}"
 
        dhcp_option_add "$cfg" "$name"


@@ -228,12 +255,12 @@ 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_foreach dnsmasq dnsmasq
        config_foreach dhcp_host_add host
        config_load dhcp
 
        args=""
        config_foreach dnsmasq dnsmasq
        config_foreach dhcp_host_add host

+       config_foreach dhcp_boot_add boot

        config_foreach dhcp_mac_add mac
        config_foreach dhcp_vendorclass_add vendorclass
        config_foreach dhcp_userclass_add userclass
        config_foreach dhcp_mac_add mac
        config_foreach dhcp_vendorclass_add vendorclass
        config_foreach dhcp_userclass_add userclass