rpms
/
NetworkManager
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Apply 0007-unblock-autoconnect-upon-reapply-rh2217903.patch

This commit is contained in:
eabdullin 2023-08-08 17:01:57 +03:00
parent fb218e43b1
commit da706f7a09
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
SOURCES/0007-unblock-autoconnect-upon-reapply-rh2217903.patch Normal file
View File

@ -0,0 +1,26 @@
diff -aruN NetworkManager-1.40.16/src/core/devices/nm-device.c NetworkManager-1.40.16.alma/src/core/devices/nm-device.c
--- NetworkManager-1.40.16/src/core/devices/nm-device.c 2023-02-23 11:42:52
+++ NetworkManager-1.40.16.alma/src/core/devices/nm-device.c 2023-08-08 17:55:53
@@ -12826,6 +12826,7 @@
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,
@@ -12997,6 +12998,14 @@
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;
}

9
SPECS/NetworkManager.spec
View File

@ -6,7 +6,7 @@
%global epoch_version 1
%global real_version 1.40.16
%global rpm_version %{real_version}
%global release_version 3
%global release_version 4
%global snapshot %{nil}
%global git_sha %{nil}
%global bcond_default_debug 0
@ -198,9 +198,11 @@ Patch4: 0004-Revert-infiniband-avoid-normalizing-the-p-key-when-r.patch
Patch5: 0005-libnm-docs-clarify-behavior-of-infiniband.p-key-prop.patch
# This patch was taken from //gitlab.com/redhat/centos-stream/rpms/NetworkManager/-/raw/be40f1d84c6be08681327c3677962a3317f8aeb4/1005-ipv6ll-don-t-regenerate-the-address-when-removed-rh2209353.patch
Patch6: 0006-ipv6ll-don-t-regenerate-the-address-when-removed-rh2209353.patch
# Bugfixes that are only relevant until next rebase of the package.
# Patch1001: 1001-some.patch
# https://git.almalinux.org/rpms/NetworkManager/commit/cc98a44c6dfde57ceeffa71654c0937a27b9ce43
# and backported to 1.40.16
Patch7: 0007-unblock-autoconnect-upon-reapply-rh2217903.patch
Requires(post): systemd
%if 0%{?fedora} || 0%{?rhel} >= 8
@ -1236,6 +1238,9 @@ fi
%changelog
* Tue Aug 08 2023 Eduard Abdullin <eabdullin@almalinux.org> - 1:1.40.16-4.alma
- Apply 0007-unblock-autoconnect-upon-reapply-rh2217903.patch
* Fri Jul 14 2023 Eduard Abdullin <eabdullin@almalinux.org> - 1:1.40.16-3.alma
- Apply 0004-Revert-infiniband-avoid-normalizing-the-p-key-when-r.patch
- Apply 0005-libnm-docs-clarify-behavior-of-infiniband.p-key-prop.patch