import UBI NetworkManager-1.54.0-3.el10_1

This commit is contained in:
AlmaLinux RelEng Bot 2026-04-07 12:57:14 -04:00
parent fbb75a627d
commit 78c6b72c21
2 changed files with 38 additions and 1 deletions

View File

@ -0,0 +1,33 @@
From ec93c9d282dc9e73fc2566554a4114a2c86e79b2 Mon Sep 17 00:00:00 2001
From: Pradyumn Rahar <pradyumn.rahar@oracle.com>
Date: Tue, 9 Sep 2025 15:23:22 +0000
Subject: [PATCH] bond: remove `lacp_active` option from reapply subset
NM_SETTING_BOND_OPTION_LACP_ACTIVE is flagged as BOND_OPTFLAG_IFDOWN in
the kernel and hence should not be in OPTIONS_REAPPLY_SUBSET.
Authored-by: Mohith Kumar Thummaluru <mohith.k.kumar.thummaluru@oracle.com>
Signed-off-by: Mohith Kumar Thummaluru <mohith.k.kumar.thummaluru@oracle.com>
Signed-off-by: Pradyumn Rahar <pradyumn.rahar@oracle.com>
(cherry picked from commit 9c48bae3b2747fb182f74897c8b8251cb820c804)
---
src/core/devices/nm-device-bond.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/core/devices/nm-device-bond.c b/src/core/devices/nm-device-bond.c
index 673d236194..39e68e966b 100644
--- a/src/core/devices/nm-device-bond.c
+++ b/src/core/devices/nm-device-bond.c
@@ -52,8 +52,7 @@
NM_SETTING_BOND_OPTION_PACKETS_PER_SLAVE, NM_SETTING_BOND_OPTION_PRIMARY_RESELECT, \
NM_SETTING_BOND_OPTION_RESEND_IGMP, NM_SETTING_BOND_OPTION_USE_CARRIER, \
NM_SETTING_BOND_OPTION_XMIT_HASH_POLICY, NM_SETTING_BOND_OPTION_NUM_GRAT_ARP, \
- NM_SETTING_BOND_OPTION_PEER_NOTIF_DELAY, NM_SETTING_BOND_OPTION_ARP_MISSED_MAX, \
- NM_SETTING_BOND_OPTION_LACP_ACTIVE
+ NM_SETTING_BOND_OPTION_PEER_NOTIF_DELAY, NM_SETTING_BOND_OPTION_ARP_MISSED_MAX
#define OPTIONS_REAPPLY_FULL \
OPTIONS_REAPPLY_SUBSET, NM_SETTING_BOND_OPTION_ACTIVE_SLAVE, \
--
2.53.0

View File

@ -7,7 +7,7 @@
%global real_version 1.54.0
%global git_tag_version 1.54.0
%global rpm_version %{real_version}
%global release_version 2
%global release_version 3
%global snapshot %{nil}
%global git_sha %{nil}
%global bcond_default_debug 0
@ -190,6 +190,7 @@ Source9: readme-ifcfg-rh-migrated.txt
# Bugfixes that are only relevant until next rebase of the package.
Patch1001: 1001-ovs-don-t-remove-unrelated-external-ports-rhel-121106.patch
Patch1002: 1002-support-reapplying-sriov-vfs-rhel-113956.patch
Patch1003: 1003-remove-lacp-active-from-reapply-subset-rhel-154247.patch
Requires(post): systemd
Requires(post): systemd-udev
@ -1087,6 +1088,9 @@ fi
%changelog
* Mon Mar 09 2026 Ján Václav <jvaclav@redhat.com> - 1:1.54.0-3
- Fix unexpected lacp_active error in logs (RHEL-154247)
* Wed Oct 15 2025 Íñigo Huguet <ihuguet@redhat.com> - 1:1.54.0-2
- Support reapplying sriov.vfs (RHEL-113956)
- Fix removing unrelated OVS ports (RHEL-121106)