fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dnsmasq: remove check for existing dhcp server

Browse Source 
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>
(cherry picked from commit a3053c3104c768fbe196c205e6866e72db26f22e)
This commit is contained in:
Kevin Darbyshire-Bryant 2017-02-01 11:49:31 +00:00 committed by ZiMing Mo
parent 2a30b7b186
commit 75b8de3866
No known key found for this signature in database
GPG Key ID: 1BED2E3A77AE5ECF
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
package/network/services/dnsmasq/files/dnsmasq.init
View File

@ -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