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

setting-connection: Unblock autoconnect upon finish of Reapply

Browse source 
The activation of a connection will clear the block of autoconnect,
we should do the same for reapply.

Signed-off-by: Gris Ge <fge@redhat.com>
(cherry picked from commit 0486efd358)
(cherry picked from commit 18ce5f43bd)
(cherry picked from commit 2695396939)
(cherry picked from commit 32d2e3c14b)
(cherry picked from commit 387ae9d7ff)
This commit is contained in:
Gris Ge 2023-06-27 15:02:54 +08:00
parent 8da69be278
commit 6f2c7733ce
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/core/devices/nm-device.c
View file

@ -12750,6 +12750,7 @@ check_and_reapply_connection(NMDevice * self,
NMSettingIPConfig * s_ip4_old, *s_ip4_new; NMSettingIPConfig * s_ip4_old, *s_ip4_new;
NMSettingIPConfig * s_ip6_old, *s_ip6_new; NMSettingIPConfig * s_ip6_old, *s_ip6_new;
GHashTableIter iter; GHashTableIter iter;
NMSettingsConnection *sett_conn;
if (priv->state < NM_DEVICE_STATE_PREPARE || priv->state > NM_DEVICE_STATE_ACTIVATED) { if (priv->state < NM_DEVICE_STATE_PREPARE || priv->state > NM_DEVICE_STATE_ACTIVATED) {
g_set_error_literal(error, g_set_error_literal(error,
@ -12907,6 +12908,14 @@ check_and_reapply_connection(NMDevice * self,
if (priv->state >= NM_DEVICE_STATE_ACTIVATED) if (priv->state >= NM_DEVICE_STATE_ACTIVATED)
nm_device_update_metered(self); nm_device_update_metered(self);
sett_conn = nm_device_get_settings_connection(self);
if (sett_conn) {
nm_settings_connection_autoconnect_blocked_reason_set(
sett_conn,
NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_USER_REQUEST,
FALSE);
}
return TRUE; return TRUE;
} }