From: Kevin Darbyshire-Bryant Date: Wed, 1 Feb 2017 11:49:31 +0000 (+0000) Subject: dnsmasq: remove check for existing dhcp server X-Git-Url: http://git.openwrt.org/openwrt/staging/jow.git?p=openwrt%2Fstaging%2Fjow.git;a=commitdiff_plain;h=b2715bbf8ffe687d909c7c5e0c3bd6805adde3ce dnsmasq: remove check for existing dhcp server Remove check for existing dhcp server on interface. This check could already be overridden by using 'force' parameter so this change forces 'force'. Signed-off-by: Kevin Darbyshire-Bryant --- diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init index 510d328cd2..fd2ce3d2de 100755 --- a/package/network/services/dnsmasq/files/dnsmasq.init +++ b/package/network/services/dnsmasq/files/dnsmasq.init @@ -547,15 +547,6 @@ dhcp_add() { [ -n "$netmask" ] && prefix_or_netmask="$netmask" - #check for an already active dhcp server on the interface, unless 'force' is set - config_get_bool force "$cfg" force 0 - [ $force -gt 0 ] || dhcp_check "$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 100 config_get limit "$cfg" limit 150 config_get leasetime "$cfg" leasetime 12h