X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/d9deabc7be23e4a38d0d3d0f5e7e331e93f01f0d..f7a2edf410595e53cf4ca5d742c98f835e9435bf:/package/dnsmasq/files/dnsmasq.init?ds=sidebyside diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init index fac2d8a72..4acba5b84 100644 --- a/package/dnsmasq/files/dnsmasq.init +++ b/package/dnsmasq/files/dnsmasq.init @@ -55,6 +55,10 @@ append_addnhosts() { append args "-H $1" } +append_bogusnxdomain() { + append args "-B $1" +} + dnsmasq() { local cfg="$1" append_bool "$cfg" authoritative "-K" @@ -86,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" @@ -97,7 +102,7 @@ dnsmasq() { [ "$readethers" = "1" ] && [ -e "/etc/ethers" ] || touch /etc/ethers config_get leasefile $cfg leasefile - [ -n "$leasefile" ] && ([ -e "$leasefile" ] || touch "$leasefile") + [ -n "$leasefile" ] && [ -e "$leasefile" ] || touch "$leasefile" config_get_bool cachelocal "$cfg" cachelocal 1 config_get hostsfile "$cfg" dhcphostsfile @@ -266,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 @@ -278,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 ] || { - 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