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

device: don't disable IPv6 in stage3 on reapply

Browse Source 
Resolves: RHEL-91479
This commit is contained in:
Vladimír Beneš 2025-08-15 13:17:58 +02:00
parent ffc98d938d
commit 1994fc413b
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
1019-device-dont-disable-IPv6-in-stage3-on-reapply-91479.patch Normal file
View File

@ -0,0 +1,28 @@
From a86f9ba92ed580bb054d3364ed423130475cb344 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Bene=C5=A1?= <vbenes@redhat.com>
Date: Fri, 15 Aug 2025 12:22:39 +0200
Subject: [PATCH] device: don't disable IPv6 in stage3 on reapply
Slightly modified backport of:
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/2232
---
src/core/devices/nm-device.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c
index 10b5d929fb..6b654d6d60 100644
--- a/src/core/devices/nm-device.c
+++ b/src/core/devices/nm-device.c
@@ -12204,7 +12204,8 @@ activate_stage3_ip_config(NMDevice *self)
* IPv6LL if this is not an assumed connection, since assumed connections
* will already have IPv6 set up.
*/
- if (!nm_device_sys_iface_state_is_external_or_assume(self))
+ if ((priv->state <= NM_DEVICE_STATE_IP_CONFIG || priv->ip_data_6.do_reapply)
+ && !nm_device_sys_iface_state_is_external_or_assume(self))
_dev_addrgenmode6_set(self, NM_IN6_ADDR_GEN_MODE_NONE);
/* Re-enable IPv6 on the interface */
--
2.50.1

6
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 19
%global release_version 20
%global snapshot %{nil}
%global git_sha %{nil}
%global bcond_default_debug 0
@ -214,6 +214,7 @@ Patch1015: 1015-use-etc-hosts-for-hostname-resolution-rhel-53200.patch
Patch1016: 1016-vpn-place-gateway-route-to-table-defined-in-ipvx-route-table-rhel-73051.patch
Patch1017: 1017-vpn-fix-routing-rules-support-in-vpn-conenctions-rhel-73052.patch
Patch1018: 1018-cloud-setup-azure-ensure-that-primary-address-is-pla-rhel-69462.patch
Patch1019: 1019-device-dont-disable-IPv6-in-stage3-on-reapply-91479.patch
Requires(post): systemd
%if 0%{?fedora} || 0%{?rhel} >= 8
@ -1249,6 +1250,9 @@ fi
%changelog
* Fri Aug 15 2025 Vladimír Beneš <vbenes@redhat.com> - 1:1.40.16-20
- device: don't disable IPv6 in stage3 on reapply (RHEL-91479)
* Fri Jan 17 2025 Fernando Fernandez Mancera <ferfern@redhat.com> - 1:1.40.16-19
- cloud-setup: azure: ensure that primary address is placed first (RHEL-69462)