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

* Mon Nov 03 2025 Miroslav Rezanina <mrezanin@redhat.com> - 2.14.0.1-2

Browse Source 
- wla-Remove-the-10-azure-unmanaged-sriov.rules-to-avoid-c.patch [RHEL-114155]
- Resolves: RHEL-114155
  ([Azure][WALA][RHEL-10] Remove 10-azure-unmanaged-sriov.rules)
This commit is contained in:
Miroslav Rezanina 2025-11-03 13:33:11 +01:00
parent 0eebb0f8de
commit cd9e8a1a4f
3 changed files with 61 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
WALinuxAgent.spec
View File

@ -3,7 +3,7 @@
Name: WALinuxAgent
Version: 2.14.0.1
Release: 1%{?dist}
Release: 2%{?dist}
Summary: The Microsoft Azure Linux Agent
License: Apache-2.0
@ -16,6 +16,8 @@ Patch3: 0003-redhat-Use-NetworkManager-to-set-DHCP-hostnames-on-r.patch
Patch4: 0004-redhat-Add-a-udev-rule-to-avoid-managing-slave-NICs-.patch
Patch5: 0005-Use-systemctl-instead-of-service-to-manager-services.patch
Patch6: 0006-docs-add-waagent-manpage-3401.patch
# For RHEL-114155 - [Azure][WALA][RHEL-10] Remove 10-azure-unmanaged-sriov.rules
Patch7: wla-Remove-the-10-azure-unmanaged-sriov.rules-to-avoid-c.patch
BuildArch: noarch
@ -32,6 +34,7 @@ Requires: openssl
Requires: parted
Requires: python3-pyasn1
Requires: iptables
Requires: azure-vm-utils >= 0.7.0-1
BuildRequires: systemd
Requires(post): systemd
@ -128,6 +131,11 @@ rm -rf %{_unitdir}/waagent.service.d/
%endif
%changelog
* Mon Nov 03 2025 Miroslav Rezanina <mrezanin@redhat.com> - 2.14.0.1-2
- wla-Remove-the-10-azure-unmanaged-sriov.rules-to-avoid-c.patch [RHEL-114155]
- Resolves: RHEL-114155
([Azure][WALA][RHEL-10] Remove 10-azure-unmanaged-sriov.rules)
* Thu Oct 30 2025 Yuxin Sun <yuxisun@redhat.com> - 2.14.0.1-1
- Rebase to 2.14.0.1 [RHEL-116438]
- Resolves: RHEL-116438

2
module-setup.sh
View File

@ -13,5 +13,5 @@ depends() {
# called by dracut
install() {
inst_multiple cut readlink chmod
inst_rules 10-azure-unmanaged-sriov.rules 66-azure-storage.rules 99-azure-product-uuid.rules
inst_rules 66-azure-storage.rules 99-azure-product-uuid.rules
}

51
wla-Remove-the-10-azure-unmanaged-sriov.rules-to-avoid-c.patch Normal file
View File

@ -0,0 +1,51 @@
From 72f953265a08f6f08d8f22e15fac9435e1a9f067 Mon Sep 17 00:00:00 2001
From: Yuxin Sun <yuxisun@redhat.com>
Date: Fri, 31 Oct 2025 17:07:50 +0800
Subject: [PATCH] Remove the 10-azure-unmanaged-sriov.rules to avoid conflict
with
RH-Author: yuxisun <None>
RH-MergeRequest: 23: Remove 10-azure-unmanaged-sriov.rules
RH-Jira: RHEL-114155
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
RH-Commit: [1/1] 0d4ef0bec6ae84984a125968992b47e015335e78 (yuxisun/centos_src_WALinuxAgent)
Signed-off-by: Yuxin Sun <yuxisun@redhat.com>
---
.distro/WALinuxAgent.spec | 1 +
.distro/sources/module-setup.sh | 2 +-
config/10-azure-unmanaged-sriov.rules | 6 ------
setup.py | 3 +--
4 files changed, 3 insertions(+), 9 deletions(-)
delete mode 100644 config/10-azure-unmanaged-sriov.rules
diff --git a/config/10-azure-unmanaged-sriov.rules b/config/10-azure-unmanaged-sriov.rules
deleted file mode 100644
index 7eefcb26..00000000
--- a/config/10-azure-unmanaged-sriov.rules
+++ /dev/null
@@ -1,6 +0,0 @@
-# Azure VMs with accelerated networking may have MANA, mlx4, or mlx5 SR-IOV devices which are transparently bonded to a synthetic
-# hv_netvsc device. Mark devices with the IFF_SLAVE bit set as unmanaged devices:
-# AZURE_UNMANAGED_SRIOV=1 for 10-azure-unmanaged-sriov.network
-# ID_NET_MANAGED_BY=unmanaged for systemd-networkd >= 255
-# NM_UNMANAGED=1 for NetworkManager
-SUBSYSTEM=="net", ACTION!="remove", DRIVERS=="mana|mlx4_core|mlx5_core", ATTR{flags}=="0x?[89ABCDEF]??", ENV{AZURE_UNMANAGED_SRIOV}="1", ENV{ID_NET_MANAGED_BY}="unmanaged", ENV{NM_UNMANAGED}="1"
diff --git a/setup.py b/setup.py
index 30784ca6..c8e77988 100755
--- a/setup.py
+++ b/setup.py
@@ -84,8 +84,7 @@ def set_openbsd_rc_files(data_files, dest="/etc/rc.d/", src=None):
def set_udev_files(data_files, dest="/etc/udev/rules.d/", src=None):
if src is None:
- src = ["config/10-azure-unmanaged-sriov.rules",
- "config/66-azure-storage.rules",
+ src = ["config/66-azure-storage.rules",
"config/99-azure-product-uuid.rules"]
data_files.append((dest, src))
--
2.47.3