From 707e63e684e3cbd3dff986a26ca725329c5e70f5 Mon Sep 17 00:00:00 2001

From: Beniamino Galvani <bgalvani@redhat.com>

Date: Wed, 5 Aug 2020 13:26:34 +0200

Subject: [PATCH 1/7] initrd: disable STP on bridges

NM enables by default STP on bridges, which causes a forwarding delay

of 15 seconds on boot. Disable it.

(cherry picked from commit 0a006c04121a13221de585d3f778c5341f36b504)

(cherry picked from commit e2830af77a981fef5b7ea7e54dc13de17231fee9)

---

 src/initrd/nmi-cmdline-reader.c        | 12 +++++++++---

 src/initrd/tests/test-cmdline-reader.c |  1 +

 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/initrd/nmi-cmdline-reader.c b/src/initrd/nmi-cmdline-reader.c

index 17f9e1dfd2a9..8ba6dbb827b6 100644

--- a/src/initrd/nmi-cmdline-reader.c

+++ b/src/initrd/nmi-cmdline-reader.c

@@ -584,7 +584,6 @@ reader_parse_master (Reader *reader,

 {

 	NMConnection *connection;

 	NMSettingConnection *s_con;

-	NMSettingBond *s_bond;

 	gs_free char *master_to_free = NULL;

 	const char *master;

 	char *slaves;

@@ -603,8 +602,15 @@ reader_parse_master (Reader *reader,

 	s_con = nm_connection_get_setting_connection (connection);

 	master = nm_setting_connection_get_uuid (s_con);

-	if (nm_streq (type_name, NM_SETTING_BOND_SETTING_NAME)) {

-		s_bond = (NMSettingBond *)nm_connection_get_setting_by_name (connection, type_name);

+	if (nm_streq (type_name, NM_SETTING_BRIDGE_SETTING_NAME)) {

+		NMSettingBridge *s_bridge = nm_connection_get_setting_bridge (connection);

+

+		/* Avoid the forwarding delay */

+		g_object_set (s_bridge,

+		              NM_SETTING_BRIDGE_STP, FALSE,

+		              NULL);

+	} else if (nm_streq (type_name, NM_SETTING_BOND_SETTING_NAME)) {

+		NMSettingBond *s_bond = nm_connection_get_setting_bond (connection);

 		opts = get_word (&argument, ':');

 		while (opts && *opts) {

diff --git a/src/initrd/tests/test-cmdline-reader.c b/src/initrd/tests/test-cmdline-reader.c

index 04594c48bee6..074654d347d8 100644

--- a/src/initrd/tests/test-cmdline-reader.c

+++ b/src/initrd/tests/test-cmdline-reader.c

@@ -774,6 +774,7 @@ test_bridge (void)

 	s_bridge = nm_connection_get_setting_bridge (connection);

 	g_assert (s_bridge);

+	g_assert_cmpint (nm_setting_bridge_get_stp (s_bridge), ==, FALSE);

 	connection = g_hash_table_lookup (connections, "eth0");

 	g_assert (connection);

-- 

2.26.2

From 43d1669601cc106e354bbbb1fc94240a0275c9e9 Mon Sep 17 00:00:00 2001

From: Beniamino Galvani <bgalvani@redhat.com>

Date: Wed, 5 Aug 2020 16:57:41 +0200

Subject: [PATCH 2/7] initrd: wait for bootdev or all devices if rd.neednet=1

The network-legacy dracut module waits for all ethernet devices if the

command line contains rd.neednet=1. It also waits for the device

specified by 'bootdev='.

Do the same.

https://bugzilla.redhat.com/show_bug.cgi?id=1853348

(cherry picked from commit f114e16fddf854d72a8b08318359569cd83245e3)

(cherry picked from commit 98ccd2a10e89d6d251a519eb63d085b2f327bad8)

---

 src/initrd/nm-initrd-generator.h       |  2 +

 src/initrd/nmi-cmdline-reader.c        | 35 +++++++++++--

 src/initrd/tests/test-cmdline-reader.c | 70 ++++++++++++++++++++++++++

 3 files changed, 104 insertions(+), 3 deletions(-)

diff --git a/src/initrd/nm-initrd-generator.h b/src/initrd/nm-initrd-generator.h

index 9719992125ea..8e17f0455574 100644

--- a/src/initrd/nm-initrd-generator.h

+++ b/src/initrd/nm-initrd-generator.h

@@ -9,6 +9,8 @@

 #include "nm-connection.h"

 #include "nm-utils.h"

+#define NMI_WAIT_DEVICE_TIMEOUT_MS 60000

+

 static inline gboolean

 guess_ip_address_family (const char *str)

 {

diff --git a/src/initrd/nmi-cmdline-reader.c b/src/initrd/nmi-cmdline-reader.c

index 8ba6dbb827b6..85be9f132eda 100644

--- a/src/initrd/nmi-cmdline-reader.c

+++ b/src/initrd/nmi-cmdline-reader.c

@@ -873,6 +873,30 @@ reader_add_nameservers (Reader *reader, GPtrArray *nameservers)

 	}

 }

+static void

+connection_set_needed (NMConnection *connection)

+{

+	NMSettingConnection *s_con;

+

+	s_con = nm_connection_get_setting_connection (connection);

+	if (!nm_streq0 (nm_setting_connection_get_connection_type (s_con),

+	                NM_SETTING_WIRED_SETTING_NAME))

+		return;

+

+	if (nm_str_is_empty (nm_setting_connection_get_interface_name (s_con)))

+		return;

+

+	g_object_set (s_con,

+	              NM_SETTING_CONNECTION_WAIT_DEVICE_TIMEOUT, NMI_WAIT_DEVICE_TIMEOUT_MS,

+	              NULL);

+}

+

+static void

+connection_set_needed_cb (gpointer key, gpointer value, gpointer user_data)

+{

+	connection_set_needed (value);

+}

+

 GHashTable *

 nmi_cmdline_reader_parse (const char *sysfs_dir, const char *const*argv, char **hostname)

 {

@@ -1007,11 +1031,16 @@ nmi_cmdline_reader_parse (const char *sysfs_dir, const char *const*argv, char **

 		connection = reader_get_connection (reader, bootdev, NULL, TRUE);

 		reader->bootdev_connection = connection;

+		connection_set_needed (connection);

 	}

-	if (neednet && g_hash_table_size (reader->hash) == 0) {

-		/* Make sure there's some connection. */

-		reader_get_default_connection (reader);

+	if (neednet) {

+		if (g_hash_table_size (reader->hash) == 0) {

+			/* Make sure there's some connection. */

+			reader_get_default_connection (reader);

+		}

+

+		g_hash_table_foreach (reader->hash, connection_set_needed_cb, NULL);

 	}

 	if (routes)

diff --git a/src/initrd/tests/test-cmdline-reader.c b/src/initrd/tests/test-cmdline-reader.c

index 074654d347d8..7787cf5ea043 100644

--- a/src/initrd/tests/test-cmdline-reader.c

+++ b/src/initrd/tests/test-cmdline-reader.c

@@ -49,6 +49,7 @@ test_auto (void)

 	g_assert_cmpstr (nm_setting_connection_get_id (s_con), ==, "Wired Connection");

 	g_assert_cmpint (nm_setting_connection_get_timestamp (s_con), ==, 0);

 	g_assert_cmpint (nm_setting_connection_get_multi_connect (s_con), ==, NM_CONNECTION_MULTI_CONNECT_MULTIPLE);

+	g_assert_cmpint (nm_setting_connection_get_wait_device_timeout (s_con), ==, -1);

 	g_assert (nm_setting_connection_get_autoconnect (s_con));

@@ -190,6 +191,7 @@ test_if_ip4_manual (void)

 	                                       "ip=203.0.113.2::203.0.113.1:26:"

 	                                       "hostname1.example.com:eth4");

 	NMConnection *connection;

+	NMSettingConnection *s_con;

 	NMSettingIPConfig *s_ip4;

 	NMSettingIPConfig *s_ip6;

 	NMIPAddress *ip_addr;

@@ -205,6 +207,10 @@ test_if_ip4_manual (void)

 	nmtst_assert_connection_verifies_without_normalization (connection);

 	g_assert_cmpstr (nm_connection_get_id (connection), ==, "eth3");

+	s_con = nm_connection_get_setting_connection (connection);

+	g_assert (s_con);

+	g_assert_cmpint (nm_setting_connection_get_wait_device_timeout (s_con), ==, -1);

+

 	s_ip4 = nm_connection_get_setting_ip4_config (connection);

 	g_assert (s_ip4);

 	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_MANUAL);

@@ -294,6 +300,7 @@ test_multiple_merge (void)

 	const char *const*ARGV = NM_MAKE_STRV ("ip=192.0.2.2:::::eth0",

 	                                       "ip=[2001:db8::2]:::::eth0");

 	NMConnection *connection;

+	NMSettingConnection *s_con;

 	NMSettingWired *s_wired;

 	NMSettingIPConfig *s_ip4;

 	NMSettingIPConfig *s_ip6;

@@ -310,6 +317,10 @@ test_multiple_merge (void)

 	nmtst_assert_connection_verifies_without_normalization (connection);

 	g_assert_cmpstr (nm_connection_get_id (connection), ==, "eth0");

+	s_con = nm_connection_get_setting_connection (connection);

+	g_assert (s_con);

+	g_assert_cmpint (nm_setting_connection_get_wait_device_timeout (s_con), ==, -1);

+

 	s_wired = nm_connection_get_setting_wired (connection);

 	g_assert (s_wired);

@@ -341,6 +352,7 @@ test_multiple_bootdev (void)

 	                                       "ip=eth4:dhcp",

 	                                       "bootdev=eth4");

 	NMConnection *connection;

+	NMSettingConnection *s_con;

 	NMSettingIPConfig *s_ip4;

 	NMSettingIPConfig *s_ip6;

 	gs_free char *hostname = NULL;

@@ -352,12 +364,18 @@ test_multiple_bootdev (void)

 	connection = g_hash_table_lookup (connections, "eth3");

 	g_assert (connection);

+	s_con = nm_connection_get_setting_connection (connection);

+	g_assert (s_con);

+	g_assert_cmpint (nm_setting_connection_get_wait_device_timeout (s_con), ==, -1);

 	s_ip6 = nm_connection_get_setting_ip6_config (connection);

 	g_assert (s_ip6);

 	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);

 	connection = g_hash_table_lookup (connections, "eth4");

 	g_assert (connection);

+	s_con = nm_connection_get_setting_connection (connection);

+	g_assert (s_con);

+	g_assert_cmpint (nm_setting_connection_get_wait_device_timeout (s_con), ==, NMI_WAIT_DEVICE_TIMEOUT_MS);

 	s_ip4 = nm_connection_get_setting_ip4_config (connection);

 	g_assert (s_ip4);

 	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_AUTO);

@@ -388,6 +406,7 @@ test_bootdev (void)

 	g_assert_cmpstr (nm_setting_connection_get_connection_type (s_con), ==, NM_SETTING_WIRED_SETTING_NAME);

 	g_assert_cmpstr (nm_setting_connection_get_id (s_con), ==, "ens3");

 	g_assert_cmpstr (nm_setting_connection_get_interface_name (s_con), ==, "ens3");

+	g_assert_cmpint (nm_setting_connection_get_wait_device_timeout(s_con), ==, NMI_WAIT_DEVICE_TIMEOUT_MS);

 	connection = g_hash_table_lookup (connections, "vlan2");

 	g_assert (connection);

@@ -1255,6 +1274,56 @@ test_bootif_ip (void)

 	g_assert (!nm_setting_ip_config_get_ignore_auto_dns (s_ip6));

 }

+static void

+test_neednet (void)

+{

+	gs_unref_hashtable GHashTable *connections = NULL;

+	const char *const*ARGV = NM_MAKE_STRV ("rd.neednet",

+	                                       "ip=eno1:dhcp",

+	                                       "ip=172.25.1.100::172.25.1.1:24::eno2",

+	                                       "bridge=br0:eno3");

+	NMConnection *connection;

+	NMSettingConnection *s_con;

+	gs_free char *hostname = NULL;

+

+	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);

+	g_assert (connections);

+	g_assert_cmpint (g_hash_table_size (connections), ==, 4);

+	g_assert_cmpstr (hostname, ==, NULL);

+

+	connection = g_hash_table_lookup (connections, "eno1");

+	g_assert (connection);

+	nmtst_assert_connection_verifies_without_normalization (connection);

+	s_con = nm_connection_get_setting_connection (connection);

+	g_assert (s_con);

+	g_assert_cmpstr (nm_setting_connection_get_interface_name (s_con), ==, "eno1");

+	g_assert_cmpint (nm_setting_connection_get_wait_device_timeout (s_con), ==, NMI_WAIT_DEVICE_TIMEOUT_MS);

+

+	connection = g_hash_table_lookup (connections, "eno2");

+	g_assert (connection);

+	nmtst_assert_connection_verifies_without_normalization (connection);

+	s_con = nm_connection_get_setting_connection (connection);

+	g_assert (s_con);

+	g_assert_cmpstr (nm_setting_connection_get_interface_name (s_con), ==, "eno2");

+	g_assert_cmpint (nm_setting_connection_get_wait_device_timeout (s_con), ==, NMI_WAIT_DEVICE_TIMEOUT_MS);

+

+	connection = g_hash_table_lookup (connections, "eno3");

+	g_assert (connection);

+	nmtst_assert_connection_verifies_without_normalization (connection);

+	s_con = nm_connection_get_setting_connection (connection);

+	g_assert (s_con);

+	g_assert_cmpstr (nm_setting_connection_get_interface_name (s_con), ==, "eno3");

+	g_assert_cmpint (nm_setting_connection_get_wait_device_timeout (s_con), ==, NMI_WAIT_DEVICE_TIMEOUT_MS);

+

+	connection = g_hash_table_lookup (connections, "br0");

+	g_assert (connection);

+	nmtst_assert_connection_verifies_without_normalization (connection);

+	s_con = nm_connection_get_setting_connection (connection);

+	g_assert (s_con);

+	g_assert_cmpstr (nm_setting_connection_get_interface_name (s_con), ==, "br0");

+	g_assert_cmpint (nm_setting_connection_get_wait_device_timeout (s_con), ==, -1);

+}

+

 static void

 test_bootif_no_ip (void)

 {

@@ -1451,6 +1520,7 @@ int main (int argc, char **argv)

 	g_test_add_func ("/initrd/cmdline/bootif/no_ip", test_bootif_no_ip);

 	g_test_add_func ("/initrd/cmdline/bootif/hwtype", test_bootif_hwtype);

 	g_test_add_func ("/initrd/cmdline/bootif/off", test_bootif_off);

+	g_test_add_func ("/initrd/cmdline/neednet", test_neednet);

 	return g_test_run ();

 }

-- 

2.26.2

From 38da5dabaccc377695e6cc4d3621cdf0f12b28e1 Mon Sep 17 00:00:00 2001

From: Thomas Haller <thaller@redhat.com>

Date: Tue, 11 Aug 2020 15:32:46 +0200

Subject: [PATCH 3/7] settings: let NMSettings reference NMManager

NMSettings needs access to the list of all devices, which is tracked

by NMManager. Of course, this ties NMSettings and NMManager closer

together. Note that NMManager already owns a reference to NMSettings,

so they are in fact related.

The alternatives of just letting NMSettings reference NMManager (and

vice versa) would be more complicated, and likely not help to simplify

the code (on the contrary).

(cherry picked from commit d27a6055b9094163356ae2c650c566307df9a93c)

(cherry picked from commit 1745b4e0c0895df61cd4117b304dfa4e9a1d8c53)

---

 src/nm-manager.c           |  2 +-

 src/settings/nm-settings.c | 44 ++++++++++++++++++++++++++++++++++++--

 src/settings/nm-settings.h |  3 ++-

 3 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/src/nm-manager.c b/src/nm-manager.c

index d687fcd7f219..6095f2687153 100644

--- a/src/nm-manager.c

+++ b/src/nm-manager.c

@@ -7455,7 +7455,7 @@ constructed (GObject *object)

 	G_OBJECT_CLASS (nm_manager_parent_class)->constructed (object);

-	priv->settings = nm_settings_new ();

+	priv->settings = nm_settings_new (self);

 	nm_dbus_object_export (NM_DBUS_OBJECT (priv->settings));

diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c

index 0a1e7b47d6c4..85c5e5e77f85 100644

--- a/src/settings/nm-settings.c

+++ b/src/settings/nm-settings.c

@@ -60,6 +60,7 @@

 #include "plugins/keyfile/nms-keyfile-storage.h"

 #include "nm-agent-manager.h"

 #include "nm-config.h"

+#include "nm-manager.h"

 #include "nm-audit-manager.h"

 #include "NetworkManagerUtils.h"

 #include "nm-dispatcher.h"

@@ -324,6 +325,7 @@ _sett_conn_entry_find_shadowed_storage (SettConnEntry *sett_conn_entry,

 /*****************************************************************************/

 NM_GOBJECT_PROPERTIES_DEFINE (NMSettings,

+	PROP_MANAGER,

 	PROP_UNMANAGED_SPECS,

 	PROP_HOSTNAME,

 	PROP_CAN_MODIFY,

@@ -348,6 +350,8 @@ typedef struct {

 	NMPlatform *platform;

+	NMManager *manager;

+

 	NMHostnameManager *hostname_manager;

 	NMSessionMonitor *session_monitor;

@@ -3805,6 +3809,26 @@ get_property (GObject *object, guint prop_id,

 	}

 }

+static void

+set_property (GObject *object, guint prop_id,

+              const GValue *value, GParamSpec *pspec)

+{

+	NMSettings *self = NM_SETTINGS (object);

+	NMSettingsPrivate *priv = NM_SETTINGS_GET_PRIVATE (self);

+

+	switch (prop_id) {

+	case PROP_MANAGER:

+		/* construct-only */

+		priv->manager = g_value_get_pointer (value);

+		nm_assert (NM_IS_MANAGER (priv->manager));

+		g_object_add_weak_pointer (G_OBJECT (priv->manager), (gpointer *) &priv->manager);

+		break;

+	default:

+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);

+		break;

+	}

+}

+

 /*****************************************************************************/

 static void

@@ -3833,9 +3857,13 @@ nm_settings_init (NMSettings *self)

 }

 NMSettings *

-nm_settings_new (void)

+nm_settings_new (NMManager *manager)

 {

-	return g_object_new (NM_TYPE_SETTINGS, NULL);

+	nm_assert (NM_IS_MANAGER (manager));

+

+	return g_object_new (NM_TYPE_SETTINGS,

+	                     NM_SETTINGS_MANAGER, manager,

+	                     NULL);

 }

 static void

@@ -3915,6 +3943,11 @@ finalize (GObject *object)

 	g_clear_object (&priv->config);

 	g_clear_object (&priv->platform);

+

+	if (priv->manager) {

+		g_object_remove_weak_pointer (G_OBJECT (priv->manager), (gpointer *) &priv->manager);

+		priv->manager = NULL;

+	}

 }

 static const GDBusSignalInfo signal_info_new_connection = NM_DEFINE_GDBUS_SIGNAL_INFO_INIT (

@@ -4051,9 +4084,16 @@ nm_settings_class_init (NMSettingsClass *class)

 	dbus_object_class->interface_infos = NM_DBUS_INTERFACE_INFOS (&interface_info_settings);

 	object_class->get_property = get_property;

+	object_class->set_property = set_property;

 	object_class->dispose = dispose;

 	object_class->finalize = finalize;

+	obj_properties[PROP_MANAGER] =

+	    g_param_spec_pointer (NM_SETTINGS_MANAGER, "", "",

+	                          G_PARAM_CONSTRUCT_ONLY |

+	                          G_PARAM_WRITABLE |

+	                          G_PARAM_STATIC_STRINGS);

+

 	obj_properties[PROP_UNMANAGED_SPECS] =

 	    g_param_spec_boxed (NM_SETTINGS_UNMANAGED_SPECS, "", "",

 	                        G_TYPE_STRV,

diff --git a/src/settings/nm-settings.h b/src/settings/nm-settings.h

index aa7e36e09395..b7baf4373280 100644

--- a/src/settings/nm-settings.h

+++ b/src/settings/nm-settings.h

@@ -26,6 +26,7 @@

 #define NM_SETTINGS_CAN_MODIFY       "can-modify"

 #define NM_SETTINGS_CONNECTIONS      "connections"

 #define NM_SETTINGS_STARTUP_COMPLETE "startup-complete"

+#define NM_SETTINGS_MANAGER          "manager"

 #define NM_SETTINGS_SIGNAL_CONNECTION_ADDED              "connection-added"

 #define NM_SETTINGS_SIGNAL_CONNECTION_UPDATED            "connection-updated"

@@ -53,7 +54,7 @@ GType nm_settings_get_type (void);

 NMSettings *nm_settings_get (void);

 #define NM_SETTINGS_GET (nm_settings_get ())

-NMSettings *nm_settings_new (void);

+NMSettings *nm_settings_new (NMManager *manager);

 gboolean nm_settings_start (NMSettings *self, GError **error);

-- 

2.26.2

From bc8ea71287204996830a4f02657d4d036e8c85ff Mon Sep 17 00:00:00 2001

From: Thomas Haller <thaller@redhat.com>

Date: Tue, 11 Aug 2020 15:34:59 +0200

Subject: [PATCH 4/7] settings: rework wait-device-timeout handling and

 consider device compatibility

A profile can configure "connection.wait-device-timeout" to indicate

that startup complete is blocked until a suitable device around.

This is useful for NetworkManager-wait-online and initrd mode.

Previously, we looked at NMPlatform whether a link with matching

interface-name was present. That is wrong because it cannot handle

profiles that rely on "ethernet.mac-address" setting or other "match"

settings. Also, the mere presence of the link does not yet mean

that the NMDevice was created and ready. In fact, there is a race here:

NMPlatform indicates that the device is ready (unblocking NMSettings),

but there is no corresponding NMDevice yet which keeps NetworkManager

busy to block startup complete.

Rework this. Now, only check whether there is a compatible device for

the profile.

Since we wait for compatible devices, it works now not only for the

interface name. Note that we do some optimizations so that we don't have

to re-evaluate all profiles (w.r.t. all devices) whenever something on the

device changes: we only care about this when all devices finally become

ready.

Also, we no longer start the timeout for "connection.wait-device-timeout"

when the profile appears. Instead, there is one system-wide start time

(NMSettingsPrivate.startup_complete_start_timestamp_msec). That simplifies

code and makes sense: we start waiting when NetworkManager is starting, not

when the profile gets added. Also, we wait for all profiles to become

ready together.

(cherry picked from commit 3df662f534c49c9df3e16808be125a562c97d954)

(cherry picked from commit 7ab8c5ba252e38b5cdeb958a7753df5fee1c55db)

---

 clients/common/settings-docs.h.in  |   2 +-

 libnm-core/nm-setting-connection.c |  23 +-

 src/nm-manager.c                   |  32 ++-

 src/settings/nm-settings.c         | 336 +++++++++++++++--------------

 src/settings/nm-settings.h         |   3 +-

 5 files changed, 209 insertions(+), 187 deletions(-)

diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in

index 7b891500d8c9..606a1b95c5df 100644

--- a/clients/common/settings-docs.h.in

+++ b/clients/common/settings-docs.h.in

@@ -171,7 +171,7 @@

 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_TIMESTAMP N_("The time, in seconds since the Unix Epoch, that the connection was last _successfully_ fully activated. NetworkManager updates the connection timestamp periodically when the connection is active to ensure that an active connection has the latest timestamp. The property is only meant for reading (changes to this property will not be preserved).")

 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_TYPE N_("Base type of the connection. For hardware-dependent connections, should contain the setting name of the hardware-type specific setting (ie, \"802-3-ethernet\" or \"802-11-wireless\" or \"bluetooth\", etc), and for non-hardware dependent connections like VPN or otherwise, should contain the setting name of that setting type (ie, \"vpn\" or \"bridge\", etc).")

 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_UUID N_("A universally unique identifier for the connection, for example generated with libuuid.  It should be assigned when the connection is created, and never changed as long as the connection still applies to the same network.  For example, it should not be changed when the \"id\" property or NMSettingIP4Config changes, but might need to be re-created when the Wi-Fi SSID, mobile broadband network provider, or \"type\" property changes. The UUID must be in the format \"2815492f-7e56-435e-b2e9-246bd7cdc664\" (ie, contains only hexadecimal characters and \"-\").")

-#define DESCRIBE_DOC_NM_SETTING_CONNECTION_WAIT_DEVICE_TIMEOUT N_("Timeout in milliseconds to wait for device at startup. During boot, devices may take a while to be detected by the driver. This property will cause to delay NetworkManager-wait-online.service and nm-online to give the device a chance to appear. Note that this property only works together with NMSettingConnection:interface-name to identify the device that will be waited for. The value 0 means no wait time. The default value is -1, which currently has the same meaning as no wait time.")

+#define DESCRIBE_DOC_NM_SETTING_CONNECTION_WAIT_DEVICE_TIMEOUT N_("Timeout in milliseconds to wait for device at startup. During boot, devices may take a while to be detected by the driver. This property will cause to delay NetworkManager-wait-online.service and nm-online to give the device a chance to appear. This works by waiting for the given timeout until a compatible device for the profile is available and managed. The value 0 means no wait time. The default value is -1, which currently has the same meaning as no wait time.")

 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_ZONE N_("The trust level of a the connection.  Free form case-insensitive string (for example \"Home\", \"Work\", \"Public\").  NULL or unspecified zone means the connection will be placed in the default zone as defined by the firewall. When updating this property on a currently activated connection, the change takes effect immediately.")

 #define DESCRIBE_DOC_NM_SETTING_DCB_APP_FCOE_FLAGS N_("Specifies the NMSettingDcbFlags for the DCB FCoE application.  Flags may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4).")

 #define DESCRIBE_DOC_NM_SETTING_DCB_APP_FCOE_MODE N_("The FCoE controller mode; either \"fabric\" (default) or \"vn2vn\".")

diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c

index 018129bef200..03f8fb23c099 100644

--- a/libnm-core/nm-setting-connection.c

+++ b/libnm-core/nm-setting-connection.c

@@ -689,7 +689,7 @@ nm_setting_connection_is_slave_type (NMSettingConnection *setting,

  * @setting: the #NMSettingConnection

  *

  * Returns: the %NM_SETTING_CONNECTION_WAIT_DEVICE_TIMEOUT property with

- *   the timeout in milli seconds. -1 is the default.

+ *   the timeout in milliseconds. -1 is the default.

  *

  * Since: 1.20

  */

@@ -1218,20 +1218,6 @@ after_interface_name:

 		return FALSE;

 	}

-	if (   priv->wait_device_timeout != -1

-	    && !priv->interface_name) {

-		/* currently, only waiting by interface-name is implemented. Hence reject

-		 * configurations that are not implemented (yet). */

-		g_set_error (error,

-		             NM_CONNECTION_ERROR,

-		             NM_CONNECTION_ERROR_INVALID_PROPERTY,

-		             _("wait-device-timeout requires %s"),

-		             NM_SETTING_CONNECTION_INTERFACE_NAME);

-		g_prefix_error (error, "%s.%s: ", NM_SETTING_CONNECTION_SETTING_NAME,

-		                NM_SETTING_CONNECTION_WAIT_DEVICE_TIMEOUT);

-		return FALSE;

-	}

-

 	if (priv->mud_url) {

 		if (!priv->mud_url[0]) {

 			g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,

@@ -2314,10 +2300,9 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)

 	 * Timeout in milliseconds to wait for device at startup.

 	 * During boot, devices may take a while to be detected by the driver.

 	 * This property will cause to delay NetworkManager-wait-online.service

-	 * and nm-online to give the device a chance to appear.

-	 *

-	 * Note that this property only works together with NMSettingConnection:interface-name

-	 * to identify the device that will be waited for.

+	 * and nm-online to give the device a chance to appear. This works by

+	 * waiting for the given timeout until a compatible device for the

+	 * profile is available and managed.

 	 *

 	 * The value 0 means no wait time. The default value is -1, which

 	 * currently has the same meaning as no wait time.

diff --git a/src/nm-manager.c b/src/nm-manager.c

index 6095f2687153..778e3b946ac9 100644

--- a/src/nm-manager.c

+++ b/src/nm-manager.c

@@ -1561,13 +1561,6 @@ check_if_startup_complete (NMManager *self)

 	if (!priv->devices_inited)

 		return;

-	reason = nm_settings_get_startup_complete_blocked_reason (priv->settings);

-	if (reason) {

-		_LOGD (LOGD_CORE, "startup complete is waiting for connection (%s)",

-		       reason);

-		return;

-	}

-

 	c_list_for_each_entry (device, &priv->devices_lst_head, devices_lst) {

 		reason = nm_device_has_pending_action_reason (device);

 		if (reason) {

@@ -1578,6 +1571,31 @@ check_if_startup_complete (NMManager *self)

 		}

 	}

+	/* All NMDevice must be ready. But also NMSettings tracks profiles that wait for

+	 * ready devices via "connection.wait-device-timeout".

+	 *

+	 * Note that we only re-check nm_settings_get_startup_complete_blocked_reason() when

+	 * all of the devices become ready (again).

+	 *

+	 * For example, assume we have device "eth1" and "profile-eth2" which waits for "eth2".

+	 * If "eth1" is ready (no pending action), we only need to re-evaluate "profile-eth2"

+	 * if we have another device ("eth2"), that becomes non-ready (had pending actions)

+	 * and again become ready. We don't need to check "profile-eth2" until "eth2" becomes

+	 * non-ready.

+	 * That is why nm_settings_get_startup_complete_blocked_reason() only has any significance

+	 * if all devices are ready too. It allows us to cut down the number of checks whether

+	 * NMSettings is ready. That's because we don't need to re-evaluate on minor changes of

+	 * a device, only when all devices become managed and ready. */

+

+	g_signal_handlers_block_by_func (priv->settings, settings_startup_complete_changed, self);

+	reason = nm_settings_get_startup_complete_blocked_reason (priv->settings, TRUE);

+	g_signal_handlers_unblock_by_func (priv->settings, settings_startup_complete_changed, self);

+	if (reason) {

+		_LOGD (LOGD_CORE, "startup complete is waiting for connection (%s)",

+		       reason);

+		return;

+	}

+

 	_LOGI (LOGD_CORE, "startup complete");

 	priv->startup = FALSE;

diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c

index 85c5e5e77f85..ef86d2d2c836 100644

--- a/src/settings/nm-settings.c

+++ b/src/settings/nm-settings.c

@@ -376,9 +376,9 @@ typedef struct {

 	GSList *unmanaged_specs;

 	GSList *unrecognized_specs;

+	gint64 startup_complete_start_timestamp_msec;

 	GHashTable *startup_complete_idx;

-	NMSettingsConnection *startup_complete_blocked_by;

-	gulong startup_complete_platform_change_id;

+	CList startup_complete_scd_lst_head;

 	guint startup_complete_timeout_id;

 	guint connections_len;

@@ -427,7 +427,7 @@ static void default_wired_clear_tag (NMSettings *self,

 static void _clear_connections_cached_list (NMSettingsPrivate *priv);

 static void _startup_complete_check (NMSettings *self,

-                                     gint64 now_us);

+                                     gint64 now_msec);

 /*****************************************************************************/

@@ -465,34 +465,51 @@ _emit_connection_flags_changed (NMSettings *self,

 typedef struct {

 	NMSettingsConnection *sett_conn;

-	gint64 start_at;

-	gint64 timeout;

+	CList scd_lst;

+	gint64 timeout_msec;

 } StartupCompleteData;

 static void

 _startup_complete_data_destroy (StartupCompleteData *scd)

 {

+	c_list_unlink_stale (&scd->scd_lst);

 	g_object_unref (scd->sett_conn);

-	g_slice_free (StartupCompleteData, scd);

+	nm_g_slice_free (scd);

 }

 static gboolean

-_startup_complete_check_is_ready (NMPlatform *platform,

+_startup_complete_check_is_ready (NMSettings *self,

                                   NMSettingsConnection *sett_conn)

 {

-	const NMPlatformLink *plink;

-	const char *ifname;

+	NMSettingsPrivate *priv = NM_SETTINGS_GET_PRIVATE (self);

+	NMConnection *conn;

+	const CList *tmp_lst;

+	NMDevice *device;

+

+	if (!priv->manager)

+		return TRUE;

+

+	conn = nm_settings_connection_get_connection (sett_conn);

-	/* FIXME: instead of just looking for the interface name, it would be better

-	 *        to wait for a device that is compatible with the profile. */

+	nm_manager_for_each_device (priv->manager, device, tmp_lst) {

-	ifname = nm_connection_get_interface_name (nm_settings_connection_get_connection (sett_conn));

+		if (!nm_device_is_real (device))

+			continue;

+

+		if (   nm_device_get_state (device) < NM_DEVICE_STATE_UNAVAILABLE

+		    || nm_device_has_pending_action (device)) {

+			/* while a device is not yet available and still has a pending

+			 * action itself, it's not a suitable candidate. */

+			continue;

+		}

+

+		if (!nm_device_check_connection_compatible (device, conn, NULL))

+			continue;

-	if (!ifname)

 		return TRUE;

+	}

-	plink = nm_platform_link_get_by_ifname (platform, ifname);

-	return plink && plink->initialized;

+	return FALSE;

 }

 static gboolean

@@ -506,117 +523,98 @@ _startup_complete_timeout_cb (gpointer user_data)

 	return G_SOURCE_REMOVE;

 }

-static void

-_startup_complete_platform_change_cb (NMPlatform *platform,

-                                      int obj_type_i,

-                                      int ifindex,

-                                      const NMPlatformLink *link,

-                                      int change_type_i,