summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2022-07-11 16:07:09 +0200
committerLubomir Rintel <lkundrak@v3.sk>2022-07-25 13:41:22 +0200
commitb2a6d9d2aa9d4d25221f1242f55b450d9f9ea9a9 (patch)
treef84035addb0b6f82c0cc44908cbb417396a8f603
parent4d0227f3fa60e19a947af821eace92e9b71950ac (diff)
downloadNetworkManager-b2a6d9d2aa9d4d25221f1242f55b450d9f9ea9a9.tar.gz
manager: recreate virtual devices on "nmcli net on"
"nmcli networking off" brings down all connections, resulting in virtual devices disappearing: # nmcli c add type dummy ifname dummy0 # nmcli networking off # nmcli networking on # nmcli d show dummy0 Error: Device 'dummy0' not found. Attempt to recreate them all upon bringing the networking back up. Fixes-test: @ovs_cloned_mac_set_on_iface https://bugzilla.redhat.com/show_bug.cgi?id=2093175 https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1292
-rw-r--r--src/core/nm-manager.c28
1 files changed, 22 insertions, 6 deletions
diff --git a/src/core/nm-manager.c b/src/core/nm-manager.c
index 39633de170..3af24aa00b 100644
--- a/src/core/nm-manager.c
+++ b/src/core/nm-manager.c
@@ -2250,6 +2250,18 @@ connection_updated_cb(NMSettings *settings,
connection_changed(self, sett_conn);
}
+static void
+connections_changed(NMManager *self)
+{
+ NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE(self);
+ NMSettingsConnection *const *connections;
+ guint i;
+
+ connections = nm_settings_get_connections_sorted_by_autoconnect_priority(priv->settings, NULL);
+ for (i = 0; connections[i]; i++)
+ connection_changed(self, connections[i]);
+}
+
/*****************************************************************************/
static void
@@ -6598,6 +6610,10 @@ do_sleep_wake(NMManager *self, gboolean sleeping_changed)
FALSE,
NM_DEVICE_STATE_REASON_NOW_MANAGED);
}
+
+ /* Give the connections a chance to recreate the virtual devices.
+ * We've torn them down on sleep. */
+ connections_changed(self);
}
nm_manager_update_state(self);
@@ -7158,9 +7174,8 @@ devices_inited_cb(gpointer user_data)
gboolean
nm_manager_start(NMManager *self, GError **error)
{
- NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE(self);
- NMSettingsConnection *const *connections;
- guint i;
+ NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE(self);
+ guint i;
nm_device_factory_manager_load_factories(_register_device_factory, self);
@@ -7214,9 +7229,10 @@ nm_manager_start(NMManager *self, GError **error)
NM_SETTINGS_SIGNAL_CONNECTION_UPDATED,
G_CALLBACK(connection_updated_cb),
self);
- connections = nm_settings_get_connections_sorted_by_autoconnect_priority(priv->settings, NULL);
- for (i = 0; connections[i]; i++)
- connection_changed(self, connections[i]);
+
+ /* Make sure virtual devices for all connections are created so
+ * that they could be autoconnected. */
+ connections_changed(self);
nm_clear_g_source(&priv->devices_inited_id);
priv->devices_inited_id = g_idle_add_full(G_PRIORITY_LOW + 10, devices_inited_cb, self, NULL);