bcm63xx: Add support for the T-Com Speedport W 500V.

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

diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index c69f0d2..4acba5b 100644 (file)
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -55,6 +55,10 @@ append_addnhosts() {
        append args "-H $1"
 }
 
        append args "-H $1"
 }
 

+append_bogusnxdomain() {
+       append args "-B $1"
+}
+

 dnsmasq() {
        local cfg="$1"
        append_bool "$cfg" authoritative "-K"
 dnsmasq() {
        local cfg="$1"
        append_bool "$cfg" authoritative "-K"


@@ -74,6 +78,7 @@ dnsmasq() {
        append_bool "$cfg" enable_tftp "--enable-tftp"
        append_bool "$cfg" nonwildcard "-z"
 
        append_bool "$cfg" enable_tftp "--enable-tftp"
        append_bool "$cfg" nonwildcard "-z"
 

+       append_parm "$cfg" cachesize "-c"

        append_parm "$cfg" dnsforwardmax "-0"
        append_parm "$cfg" port "-p"
        append_parm "$cfg" ednspacket_max "-P"
        append_parm "$cfg" dnsforwardmax "-0"
        append_parm "$cfg" port "-p"
        append_parm "$cfg" ednspacket_max "-P"


@@ -85,6 +90,7 @@ dnsmasq() {
        config_list_foreach "$cfg" "interface" append_interface
        config_list_foreach "$cfg" "notinterface" append_notinterface
        config_list_foreach "$cfg" "addnhosts" append_addnhosts
        config_list_foreach "$cfg" "interface" append_interface
        config_list_foreach "$cfg" "notinterface" append_notinterface
        config_list_foreach "$cfg" "addnhosts" append_addnhosts

+       config_list_foreach "$cfg" "bogusnxdomain" append_bogusnxdomain

        append_parm "$cfg" "leasefile" "-l"
        append_parm "$cfg" "resolvfile" "-r"
        append_parm "$cfg" "tftp_root" "--tftp-root"
        append_parm "$cfg" "leasefile" "-l"
        append_parm "$cfg" "resolvfile" "-r"
        append_parm "$cfg" "tftp_root" "--tftp-root"


@@ -96,7 +102,7 @@ dnsmasq() {
        [ "$readethers" = "1" ] && [ -e "/etc/ethers" ] || touch /etc/ethers
 
        config_get leasefile $cfg leasefile
        [ "$readethers" = "1" ] && [ -e "/etc/ethers" ] || touch /etc/ethers
 
        config_get leasefile $cfg leasefile

-       [ -e "$leasefile" ] || touch "$leasefile"
+       [ -n "$leasefile" ] && [ -e "$leasefile" ] || touch "$leasefile"

        config_get_bool cachelocal "$cfg" cachelocal 1
 
        config_get hostsfile "$cfg" dhcphostsfile
        config_get_bool cachelocal "$cfg" cachelocal 1
 
        config_get hostsfile "$cfg" dhcphostsfile


@@ -265,7 +271,7 @@ dhcp_add() {
                DNS_SERVERS="$DNS_SERVERS $dnsserver"
        }
 
                DNS_SERVERS="$DNS_SERVERS $dnsserver"
        }
 

-       append_bool "$cfg" ignore "-2 '$ifname'" && return 0
+       append_bool "$cfg" ignore "-2 $ifname" && return 0

 
        config_get proto "$net" proto
        [ static = "$proto" ] || return 0
 
        config_get proto "$net" proto
        [ static = "$proto" ] || return 0


@@ -277,7 +283,12 @@ 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 ] || {
        #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 -s /bin/true -t 1 -i $ifname >&- && return 0
+               udhcpc -n -q -s /bin/true -t 1 -i $ifname >&- && {
+                       logger -t dnsmasq \
+                               "found already running DHCP-server on interface '$ifname'" \
+                               "refusing to start, use 'option force 1' to override"
+                       return 0
+               }

        }
 
        config_get start "$cfg" start
        }
 
        config_get start "$cfg" start