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 <kevin@darbyshire-bryant.me.uk>

diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init
index d95502c0da6cb9e07c95dccf6d1728d05aa40094..3f524d2c7a3f2c02e1cd4d6981bdddab90cadde5 100755 (executable)
--- a/package/network/services/dnsmasq/files/dnsmasq.init
+++ b/package/network/services/dnsmasq/files/dnsmasq.init
@@ -540,15 +540,6 @@ dhcp_add() {
        # Override interface netmask with dhcp config if applicable
        config_get netmask "$cfg" netmask "${subnet##*/}"
 
-       #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