Skip to content

Commit

Permalink
dnsmasq: always inform about disabled dhcp service
Browse files Browse the repository at this point in the history
Init script checks for an already active DHCP server on the interface
and if such DHCP server is found, then it logs "refusing to start DHCP"
message, starts dnsmasq without DHCP service unless `option force 1` is
set and caches the DHCP server check result.

Each consecutive service start then uses this cached DHCP server check
result, but doesn't provide log feedback about disabled DHCP service
anymore.

So this patch ensures, that the log message about disabled DHCP service
on particular interface is always provided.

Acked-by: Hans Dedecker <dedeckeh@gmail.com>
Signed-off-by: Petr Štetiar <ynezz@true.cz>
  • Loading branch information
ynezz authored and ish-hcc committed Jul 10, 2020
1 parent 5566000 commit 71cb5a1
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions package/network/services/dnsmasq/files/dnsmasq.init
Expand Up @@ -110,11 +110,6 @@ dhcp_check() {

udhcpc -n -q -s /bin/true -t 1 -i "$ifname" >&- && rv=1 || rv=0

[ $rv -eq 1 ] && \
logger -t dnsmasq \
"found already running DHCP-server on interface '$ifname'" \
"refusing to start, use 'option force 1' to override"

echo $rv > "$stamp"
return $rv
}
Expand Down Expand Up @@ -517,7 +512,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 ] || dhcp_check "$ifname" || return 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
Expand Down

0 comments on commit 71cb5a1

Please sign in to comment.