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 49291a5..4acba5b 100644 (file)
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -23,8 +23,8 @@ append_bool() {
        local option="$2"
        local value="$3"
        local _loctmp
-       config_get_bool _loctmp "$section" "$option"
-       [ "$_loctmp" -gt 0 ] && append args "$value"
+       config_get_bool _loctmp "$section" "$option" 0
+       [ $_loctmp -gt 0 ] && append args "$value"
 }
 
 append_parm() {
@@ -42,17 +42,23 @@ append_server() {
 }
 
 append_interface() {
-       append args "-i $1"
+       local ifname=$(uci_get_state network "$1" ifname "$1")
+       append args "-i $ifname"
 }
 
 append_notinterface() {
-       append args "-I $1"
+       local ifname=$(uci_get_state network "$1" ifname "$1")
+       append args "-I $ifname"
 }
 
 append_addnhosts() {
        append args "-H $1"
 }
 
+append_bogusnxdomain() {
+       append args "-B $1"
+}
+
 dnsmasq() {
        local cfg="$1"
        append_bool "$cfg" authoritative "-K"
@@ -72,6 +78,7 @@ dnsmasq() {
        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"
@@ -83,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" "bogusnxdomain" append_bogusnxdomain
        append_parm "$cfg" "leasefile" "-l"
        append_parm "$cfg" "resolvfile" "-r"
        append_parm "$cfg" "tftp_root" "--tftp-root"
@@ -94,7 +102,7 @@ dnsmasq() {
        [ "$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
@@ -263,7 +271,7 @@ dhcp_add() {
                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
@@ -274,8 +282,13 @@ 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 -s /bin/true -t 1 -i $ifname >&- && return 0
+       [ $force -gt 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