diff --git a/WALinuxAgent.spec b/WALinuxAgent.spec index 3a03bbc..e064d22 100644 --- a/WALinuxAgent.spec +++ b/WALinuxAgent.spec @@ -4,7 +4,7 @@ Name: WALinuxAgent Version: 2.14.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Microsoft Azure Linux Agent License: ASL 2.0 @@ -19,6 +19,8 @@ Patch2: 0002-Disable-automatic-log-collector.patch Patch3: 0003-redhat-Add-a-udev-rule-to-avoid-managing-slave-NICs-.patch Patch4: 0004-docs-add-waagent-manpage-3401.patch Patch5: 0005-Use-systemctl-instead-of-service-to-manager-services.patch +# For RHEL-124218 - [Azure][WALA][RHEL-9] Remove 10-azure-unmanaged-sriov.rules +Patch6: wla-Remove-10-azure-unmanaged-sriov.rules.patch # For bz#2114830 - [Azure][WALA][RHEL-9.1] Provisioning failed if no ifcfg-eth0 # For RHEL-7273 - [Azure][WALA] Consider to disable Log collector @@ -41,6 +43,7 @@ Requires: openssl Requires: parted Requires: python3-pyasn1 Requires: iptables +Requires: azure-vm-utils >= 0.7.0-1 BuildRequires: systemd Requires(post): systemd @@ -142,7 +145,6 @@ rm -rf %{_unitdir}/waagent.service.d/ %{python3_sitelib}/*.egg-info %files udev -%{_udevrulesdir}/10-azure-unmanaged-sriov.rules %{_udevrulesdir}/66-azure-storage.rules %{_udevrulesdir}/99-azure-product-uuid.rules %dir %{_prefix}/lib/dracut/modules.d/%{dracut_modname_udev} @@ -160,6 +162,11 @@ rm -rf %{_unitdir}/waagent.service.d/ %endif %changelog +* Wed Nov 12 2025 Miroslav Rezanina - 2.14.0.1-2 +- wla-Remove-10-azure-unmanaged-sriov.rules.patch [RHEL-124218] +- Resolves: RHEL-124218 + ([Azure][WALA][RHEL-9] Remove 10-azure-unmanaged-sriov.rules) + * Thu Oct 30 2025 Yuxin Sun - 2.14.0.1-1 - Rebase to 2.14.0.1 [RHEL-116436] - Resolves: RHEL-116436 diff --git a/module-setup-udev.sh b/module-setup-udev.sh index 056b197..ed7300d 100644 --- a/module-setup-udev.sh +++ b/module-setup-udev.sh @@ -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 } diff --git a/wla-Remove-10-azure-unmanaged-sriov.rules.patch b/wla-Remove-10-azure-unmanaged-sriov.rules.patch new file mode 100644 index 0000000..b51fe26 --- /dev/null +++ b/wla-Remove-10-azure-unmanaged-sriov.rules.patch @@ -0,0 +1,50 @@ +From bd24da8a9ec066f354a10581eecbc8b85617adf8 Mon Sep 17 00:00:00 2001 +From: Yuxin Sun +Date: Fri, 31 Oct 2025 17:49:02 +0800 +Subject: [PATCH] Remove 10-azure-unmanaged-sriov.rules + +RH-Author: yuxisun +RH-MergeRequest: 24: Remove 10-azure-unmanaged-sriov.rules +RH-Jira: RHEL-124218 +RH-Acked-by: Vitaly Kuznetsov +RH-Acked-by: Miroslav Rezanina +RH-Commit: [1/1] 4223f72f9f68ba9182c0b05ed76209930a8071de (yuxisun/centos_src_WALinuxAgent) + +Signed-off-by: Yuxin Sun +--- + .distro/WALinuxAgent.spec | 2 +- + .distro/sources/module-setup-udev.sh | 2 +- + config/10-azure-unmanaged-sriov.rules | 6 ------ + setup.py | 3 +-- + 4 files changed, 3 insertions(+), 10 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 +