net: +nm shouldn't provoke races

Brief version: otherwise DNS resolving might fail to perform until dnsmasq service restart or system reboot (ouch!). The problem: 1) NetworkManager requires dnsmasq; 2) dnsmasq can win a race against dhcpcd on ethernet. The result: 1) /etc/resolv.conf looks fine; 2) dnsmasq is running; 3) resolving beyond /etc/hosts fails. Suggested-by: Mikhail Efremov <sem@altlinux.org>

net: +nm shouldn't provoke races
0184a3b7 · Michael Shigorin · a3f47946 · 0184a3b7
Commit 0184a3b7 authored Jan 17, 2019 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

config.mk features.in/net/config.mk +3 -1

No files found.
--- a/features.in/net/config.mk
+++ b/features.in/net/config.mk
-+nm: use/net/nm/nodelay; @:
+nm: use/net/nm; @:

 use/net: use/services
 	@$(call add_feature)
@@ -21,6 +21,8 @@ use/net/nm: use/net
 	@$(call add,DEFAULT_SERVICES_ENABLE,NetworkManager ModemManager)
 	@$(call add,DEFAULT_SERVICES_ENABLE,livecd-save-nfs) # keep interface up

+# NOT recommended unless you know what you're doing
+# (e.g. dnsmasq can win a race against dhcpcd)
 use/net/nm/nodelay: use/net/nm
 	@$(call add,DEFAULT_SERVICES_DISABLE,NetworkManager-wait-online)