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

core: merge branch 'th/rh2152864-ovs-autoactivate'

Browse Source 
https://bugzilla.redhat.com/show_bug.cgi?id=2152864
Fixes-test: @NM_reboot_openvswitch_vlan_configuration_var2

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1603
This commit is contained in:
Thomas Haller
2023-04-27 08:29:03 +02:00
parent 840abc6c45 e699dff46a
commit e66b93b01e
1 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/core/devices/nm-device.c
View File

@@ -7860,6 +7860,10 @@ nm_device_unrealize(NMDevice *self, gboolean remove_resources, GError **error)
/* Garbage-collect unneeded unrealized devices. */
nm_device_recheck_available_connections(self);
/* In case the unrealized device is not going away, it may need to
* autoactivate. Schedule also a check for that. */
nm_device_emit_recheck_auto_activate(self);
return TRUE;
}
@@ -13568,6 +13572,7 @@ delete_cb(NMDevice *self,
GError *error,
gpointer user_data)
{
NMSettingsConnection *sett_conn;
GError *local = NULL;
if (error) {
@@ -13583,10 +13588,26 @@ delete_cb(NMDevice *self,
/* Authorized */
nm_audit_log_device_op(NM_AUDIT_OP_DEVICE_DELETE, self, TRUE, NULL, subject, NULL);
if (nm_device_unrealize(self, TRUE, &local))
g_dbus_method_invocation_return_value(context, NULL);
else
sett_conn = nm_device_get_settings_connection(self);
if (sett_conn) {
/* Block profile from autoconnecting. We block the profile, which may
* be ugly/wrong with multi-connect profiles. However, it's not
* obviously wrong, because profiles for software devices tend not to
* work with multi-connect anyway, because they describe a (unique)
* interface by name. */
nm_settings_connection_autoconnect_blocked_reason_set(
sett_conn,
NM_SETTINGS_AUTOCONNECT_BLOCKED_REASON_USER_REQUEST,
TRUE);
}
if (!nm_device_unrealize(self, TRUE, &local)) {
g_dbus_method_invocation_take_error(context, local);
return;
}
g_dbus_method_invocation_return_value(context, NULL);
}
static void