colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

manager: recreate virtual devices on "nmcli net on"

Browse Source 
"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
This commit is contained in:
Lubomir Rintel
2022-07-11 16:07:09 +02:00
parent 4d0227f3fa
commit b2a6d9d2aa
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/core/nm-manager.c
View File

@@ -2250,6 +2250,18 @@ connection_updated_cb(NMSettings *settings,
connection_changed(self, sett_conn); 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 static void
@@ -6598,6 +6610,10 @@ do_sleep_wake(NMManager *self, gboolean sleeping_changed)
FALSE, FALSE,
NM_DEVICE_STATE_REASON_NOW_MANAGED); 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); nm_manager_update_state(self);
@@ -7158,9 +7174,8 @@ devices_inited_cb(gpointer user_data)
gboolean gboolean
nm_manager_start(NMManager *self, GError **error) nm_manager_start(NMManager *self, GError **error)
{ {
NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE(self); NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE(self);
NMSettingsConnection *const *connections; guint i;
guint i;
nm_device_factory_manager_load_factories(_register_device_factory, self); 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, NM_SETTINGS_SIGNAL_CONNECTION_UPDATED,
G_CALLBACK(connection_updated_cb), G_CALLBACK(connection_updated_cb),
self); self);
connections = nm_settings_get_connections_sorted_by_autoconnect_priority(priv->settings, NULL);
for (i = 0; connections[i]; i++) /* Make sure virtual devices for all connections are created so
connection_changed(self, connections[i]); * that they could be autoconnected. */
connections_changed(self);
nm_clear_g_source(&priv->devices_inited_id); 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); priv->devices_inited_id = g_idle_add_full(G_PRIORITY_LOW + 10, devices_inited_cb, self, NULL);