fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-07 07:18:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge: branch 'bg/virt-dev-check-master'

Browse source 
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/403
https://bugzilla.redhat.com/show_bug.cgi?id=1795919
(cherry picked from commit 4bdf8c31d3)
This commit is contained in:
Beniamino Galvani 2020-01-29 16:47:49 +01:00
commit fa61147fc0
1 changed files with 27 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/nm-manager.c
View file

@ -2011,6 +2011,20 @@ system_create_virtual_device (NMManager *self, NMConnection *connection)
return device; return device;
} }
if (!find_master (self,
connection,
device,
NULL,
NULL,
NULL,
&error)) {
_LOG3D (LOGD_DEVICE, connection,
"skip activation: %s",
error->message);
g_error_free (error);
return device;
}
/* Create backing resources if the device has any autoconnect connections */ /* Create backing resources if the device has any autoconnect connections */
connections = nm_settings_get_connections_clone (priv->settings, NULL, connections = nm_settings_get_connections_clone (priv->settings, NULL,
NULL, NULL, NULL, NULL,
@ -4649,6 +4663,19 @@ _internal_activate_device (NMManager *self, NMActiveConnection *active, GError *
if (nm_active_connection_get_activation_type (active) == NM_ACTIVATION_TYPE_MANAGED) if (nm_active_connection_get_activation_type (active) == NM_ACTIVATION_TYPE_MANAGED)
nm_device_sys_iface_state_set (device, NM_DEVICE_SYS_IFACE_STATE_MANAGED); nm_device_sys_iface_state_set (device, NM_DEVICE_SYS_IFACE_STATE_MANAGED);
/* Try to find the master connection/device if the connection has a dependency */
if (!find_master (self,
applied,
device,
&master_connection,
&master_device,
&master_ac,
error)) {
g_prefix_error (error, "Can not find a master for %s: ",
nm_settings_connection_get_id (sett_conn));
return FALSE;
}
/* Create any backing resources the device needs */ /* Create any backing resources the device needs */
if (!nm_device_is_real (device)) { if (!nm_device_is_real (device)) {
NMDevice *parent; NMDevice *parent;
@ -4717,19 +4744,6 @@ _internal_activate_device (NMManager *self, NMActiveConnection *active, GError *
} }
} }
/* Try to find the master connection/device if the connection has a dependency */
if (!find_master (self,
applied,
device,
&master_connection,
&master_device,
&master_ac,
error)) {
g_prefix_error (error, "Can not find a master for %s: ",
nm_settings_connection_get_id (sett_conn));
return FALSE;
}
/* Ensure there's a master active connection the new connection we're /* Ensure there's a master active connection the new connection we're
* activating can depend on. * activating can depend on.
*/ */