aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services
diff options
context:
space:
mode:
authorDavid Bauer <mail@david-bauer.net>2020-08-18 15:09:22 +0200
committerDavid Bauer <mail@david-bauer.net>2020-08-20 23:45:26 +0200
commitaa403a440ad81b3430759d951cee1754ba5e4722 (patch)
tree53876fb336f51b6d5047d849f158aa348c49a6ee /package/network/services
parent83b1e40561d2e243b757bb5608b0feeb839fe1fa (diff)
downloadupstream-aa403a440ad81b3430759d951cee1754ba5e4722.tar.gz
upstream-aa403a440ad81b3430759d951cee1754ba5e4722.tar.bz2
upstream-aa403a440ad81b3430759d951cee1754ba5e4722.zip
dnsmasq: abort dhcp_check on interface state
Abort the dhcp-check based on the interface instead of the carrier state. In cases where the interface is up but the carrier is down, netifd won't cause a dnsmasq reload, thus dhcp won't become active on this interface. Signed-off-by: David Bauer <mail@david-bauer.net>
Diffstat (limited to 'package/network/services')
-rw-r--r--package/network/services/dnsmasq/files/dnsmasq.init4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init
index 932103d8b5..2d72bc6a28 100644
--- a/package/network/services/dnsmasq/files/dnsmasq.init
+++ b/package/network/services/dnsmasq/files/dnsmasq.init
@@ -106,9 +106,9 @@ dhcp_check() {
[ -s "$stamp" ] && return $(cat "$stamp")
- # If there's no carrier yet, skip this interface.
+ # If interface is down, skip it.
# The init script will be called again once the link is up
- case "$(devstatus "$ifname" | jsonfilter -e @.carrier)" in
+ case "$(devstatus "$ifname" | jsonfilter -e @.up)" in
false) return 1;;
esac