48 lines
1.7 KiB
Diff
48 lines
1.7 KiB
Diff
|
From 04c0fffdc3a24b66fcfd2e55714bc1308c219c24 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Gris Ge <fge@redhat.com>
|
||
|
|
Date: Tue, 27 Jun 2023 15:02:54 +0800
|
||
|
|
Subject: [PATCH 1/1] setting-connection: Unblock autoconnect upon finish of
|
||
|
|
`Reapply`
|
||
|
|
|
||
|
|
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 0486efd3584c70179072f611e63b9c0ff6851b80)
|
||
|
|
(cherry picked from commit 18ce5f43bd16b3cc394424619652c782cb3795c3)
|
||
|
|
(cherry picked from commit 2695396939d2a867145f7db569aaf5cc6b0d742c)
|
||
|
|
---
|
||
|
|
src/core/devices/nm-device.c | 9 +++++++++
|
||
|
|
1 file changed, 9 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c
|
||
|
|
index 31acc1c1fe6b..2ac55fa83cbe 100644
|
||
|
|
--- a/src/core/devices/nm-device.c
|
||
|
|
+++ b/src/core/devices/nm-device.c
|
||
|
|
@@ -12826,6 +12826,7 @@ check_and_reapply_connection(NMDevice *self,
|
||
|
|
NMConnection *con_old;
|
||
|
|
NMConnection *con_new;
|
||
|
|
GHashTableIter iter;
|
||
|
|
+ NMSettingsConnection *sett_conn;
|
||
|
|
|
||
|
|
if (priv->state < NM_DEVICE_STATE_PREPARE || priv->state > NM_DEVICE_STATE_ACTIVATED) {
|
||
|
|
g_set_error_literal(error,
|
||
|
|
@@ -12998,6 +12999,14 @@ check_and_reapply_connection(NMDevice *self,
|
||
|
|
if (priv->state >= NM_DEVICE_STATE_ACTIVATED)
|
||
|
|
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;
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
2.40.1
|
||
|
|
|