From 873737a24efba0dbf36798f56ba35a74a5fe5c73 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Tue, 30 Jul 2013 09:58:22 +0400 Subject: [PATCH] net: avoid NM showstopper at boot by default Intro: NetworkManager-wait-online.service would, well, wait for some network interface to become online or for timeout to kick in. Problem: if a LiveCD is tested in offline environment that timeout will only impede the boot. Proposed solution: use/net/nm/nodelay target has been implemented to disable that service as proposed by sem@ and done in Simply; "+nm" target changed to be an alias to this one. --- features.in/net/config.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/features.in/net/config.mk b/features.in/net/config.mk index 8f77eb05..8230b19f 100644 --- a/features.in/net/config.mk +++ b/features.in/net/config.mk @@ -1,4 +1,4 @@ -+nm: use/net/nm; @: ++nm: use/net/nm/nodelay; @: use/net: use/services @$(call add_feature) @@ -12,6 +12,9 @@ use/net/nm: use/net @$(call add,THE_LISTS,$(call tags,desktop nm)) @$(call add,DEFAULT_SERVICES_ENABLE,NetworkManager ModemManager) +use/net/nm/nodelay: use/net/nm + @$(call add,DEFAULT_SERVICES_DISABLE,NetworkManager-wait-online) + use/net/connman: use/net @$(call add,THE_PACKAGES,connman) @$(call add,DEFAULT_SERVICES_ENABLE,connman)