diff --git a/.gitignore b/.gitignore index 9951b41..ebfe904 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /v2.9.0.4.tar.gz /v2.9.1.1.tar.gz /v2.13.1.1.tar.gz +/v2.14.0.1.tar.gz diff --git a/0001-waagent.service-set-ConditionVirtualization-microsof.patch b/0001-waagent.service-set-ConditionVirtualization-microsof.patch index cdfbffd..2adf990 100644 --- a/0001-waagent.service-set-ConditionVirtualization-microsof.patch +++ b/0001-waagent.service-set-ConditionVirtualization-microsof.patch @@ -1,4 +1,4 @@ -From 2d78c9ebaba4742390e92dc5994391949b90ec4c Mon Sep 17 00:00:00 2001 +From ec6ca69785a4a9184ac5818921ab4e87dfa5b220 Mon Sep 17 00:00:00 2001 From: Chris Patterson Date: Thu, 1 Sep 2022 10:45:47 -0400 Subject: [PATCH] waagent.service: set ConditionVirtualization=|microsoft diff --git a/0002-Disable-automatic-log-collector.patch b/0002-Disable-automatic-log-collector.patch index 2f2f3c3..67f5850 100644 --- a/0002-Disable-automatic-log-collector.patch +++ b/0002-Disable-automatic-log-collector.patch @@ -1,4 +1,4 @@ -From cb221e0885f794e0ec302cbb77bff927a8d4458a Mon Sep 17 00:00:00 2001 +From c2242f64eb9cbfacbfb149d0cfa057618b22c8eb Mon Sep 17 00:00:00 2001 From: Ani Sinha Date: Mon, 6 May 2024 11:50:49 +0530 Subject: [PATCH] Disable automatic log collector diff --git a/0003-redhat-Use-NetworkManager-to-set-DHCP-hostnames-on-r.patch b/0003-redhat-Use-NetworkManager-to-set-DHCP-hostnames-on-r.patch index 2dfcb04..b7585cc 100644 --- a/0003-redhat-Use-NetworkManager-to-set-DHCP-hostnames-on-r.patch +++ b/0003-redhat-Use-NetworkManager-to-set-DHCP-hostnames-on-r.patch @@ -1,4 +1,4 @@ -From b0c1a1641973b0444045a4906d80e0b16ff755e7 Mon Sep 17 00:00:00 2001 +From eedacde55fedc03d122913004b067b785d616352 Mon Sep 17 00:00:00 2001 From: Mohammed Gamal Date: Fri, 29 Jul 2022 13:07:13 +0200 Subject: [PATCH] redhat: Use NetworkManager to set DHCP hostnames on recent diff --git a/0004-redhat-Add-a-udev-rule-to-avoid-managing-slave-NICs-.patch b/0004-redhat-Add-a-udev-rule-to-avoid-managing-slave-NICs-.patch index e1f9349..f924abd 100644 --- a/0004-redhat-Add-a-udev-rule-to-avoid-managing-slave-NICs-.patch +++ b/0004-redhat-Add-a-udev-rule-to-avoid-managing-slave-NICs-.patch @@ -1,4 +1,4 @@ -From c17811fbdb131a4cca41a847e8b666f432dbe4a8 Mon Sep 17 00:00:00 2001 +From fe3820b9ef6fa94c75d13d8124b6a2bb40122036 Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Mon, 6 Jan 2025 17:13:11 +0100 Subject: [PATCH] redhat: Add a udev rule to avoid managing slave NICs with @@ -41,7 +41,7 @@ index 00000000..7eefcb26 +# 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 e83f5989..cf6e90b5 100755 +index ca5e2d20..6471dba3 100755 --- a/setup.py +++ b/setup.py @@ -82,7 +82,8 @@ def set_openbsd_rc_files(data_files, dest="/etc/rc.d/", src=None): diff --git a/wla-Use-systemctl-instead-of-service-to-manager-services.patch b/0005-Use-systemctl-instead-of-service-to-manager-services.patch similarity index 88% rename from wla-Use-systemctl-instead-of-service-to-manager-services.patch rename to 0005-Use-systemctl-instead-of-service-to-manager-services.patch index 6925cb9..9dbeff8 100644 --- a/wla-Use-systemctl-instead-of-service-to-manager-services.patch +++ b/0005-Use-systemctl-instead-of-service-to-manager-services.patch @@ -1,8 +1,8 @@ -From 93376d3c37882f246c51843ff1b327600f074f81 Mon Sep 17 00:00:00 2001 +From cd1f4d2e6b7a73408279244bc54e82173ced73ab Mon Sep 17 00:00:00 2001 From: Yuxin Sun Date: Fri, 27 Jun 2025 01:34:20 +0800 -Subject: [PATCH 1/2] Use systemctl instead of service to manager services in - new RHEL versions (#3403) +Subject: [PATCH] Use systemctl instead of service to manager services in new + RHEL versions (#3403) RH-Author: yuxisun RH-MergeRequest: 20: Use systemctl instead of service to manager services in new RHEL versions (#3403) @@ -13,6 +13,10 @@ RH-Commit: [1/1] 95bb66dad7fda08c89a88ca347e55ec18f75d8e8 (yuxisun/WALinuxAgent- Signed-off-by: Yuxin Sun (cherry picked from commit a6cfdfdc3e04884a08cd6dd20fa035b687943fe9) + +Patch-name: wla-Use-systemctl-instead-of-service-to-manager-services.patch +Patch-id: +Patch-present-in-specfile: True --- azurelinuxagent/common/osutil/redhat.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) @@ -49,6 +53,3 @@ index b85b2d42..cf2d2f78 100644 DefaultOSUtil.publish_hostname(self, hostname) def set_dhcp_hostname(self, hostname): --- -2.39.3 - diff --git a/wla-docs-add-waagent-manpage-3401.patch b/0006-docs-add-waagent-manpage-3401.patch similarity index 90% rename from wla-docs-add-waagent-manpage-3401.patch rename to 0006-docs-add-waagent-manpage-3401.patch index 003d714..d71b6d6 100644 --- a/wla-docs-add-waagent-manpage-3401.patch +++ b/0006-docs-add-waagent-manpage-3401.patch @@ -1,7 +1,7 @@ -From 079c5ced40fe1a9153af56d86a2094060ee9aa3e Mon Sep 17 00:00:00 2001 +From 5d45586cc51454e18ee8c54dc8331a3a54b18383 Mon Sep 17 00:00:00 2001 From: Li Tian <94442129+litian1992@users.noreply.github.com> Date: Tue, 5 Aug 2025 03:18:10 +0800 -Subject: [PATCH 2/2] docs: add waagent manpage (#3401) +Subject: [PATCH] docs: add waagent manpage (#3401) RH-Author: Li Tian RH-MergeRequest: 21: redhat: docs: add waagent manpage (RHEL-10) (#3401) @@ -19,11 +19,14 @@ Signed-off-by: Li Tian Co-authored-by: maddieford <93676569+maddieford@users.noreply.github.com> (cherry picked from commit 7f9b5568b6572745b7d0776de0ff6fb70a28dba0) Signed-off-by: Li Tian + +Patch-name: wla-docs-add-waagent-manpage-3401.patch +Patch-id: +Patch-present-in-specfile: True --- - .distro/WALinuxAgent.spec | 1 + - doc/man/waagent.1 | 117 ++++++++++++++++++++++++++++++++++++++ - setup.py | 14 +++++ - 3 files changed, 132 insertions(+) + doc/man/waagent.1 | 117 ++++++++++++++++++++++++++++++++++++++++++++++ + setup.py | 14 ++++++ + 2 files changed, 131 insertions(+) create mode 100644 doc/man/waagent.1 diff --git a/doc/man/waagent.1 b/doc/man/waagent.1 @@ -150,7 +153,7 @@ index 00000000..b1d8e9eb +.SH AUTHORS +Microsoft Azure Linux Team diff --git a/setup.py b/setup.py -index cf6e90b5..9ed135fb 100755 +index 6471dba3..30784ca6 100755 --- a/setup.py +++ b/setup.py @@ -17,7 +17,9 @@ @@ -193,9 +196,6 @@ index cf6e90b5..9ed135fb 100755 set_udev_files(data_files) set_systemd_files(data_files, dest=systemd_dir_path) + set_man_files(data_files) - else: - # Use default setting - set_bin_files(data_files, dest=agent_bin_path) --- -2.39.3 - + elif name == 'chainguard': + set_bin_files(data_files, dest=agent_bin_path, src=["bin/py3/waagent"]) + set_conf_files(data_files, src=["config/chainguard/waagent.conf"]) diff --git a/WALinuxAgent.spec b/WALinuxAgent.spec index 3926584..8c3e7e2 100644 --- a/WALinuxAgent.spec +++ b/WALinuxAgent.spec @@ -2,8 +2,8 @@ %global dracut_modname 97walinuxagent Name: WALinuxAgent -Version: 2.13.1.1 -Release: 2%{?dist} +Version: 2.14.0.1 +Release: 1%{?dist} Summary: The Microsoft Azure Linux Agent License: Apache-2.0 @@ -14,10 +14,8 @@ Patch1: 0001-waagent.service-set-ConditionVirtualization-microsof.patch Patch2: 0002-Disable-automatic-log-collector.patch 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 -# For RHEL-109465 - [Azure][RHEL-10][WALA][Image mode] Cannot find 'service' command -Patch5: wla-Use-systemctl-instead-of-service-to-manager-services.patch -# For RHEL-96792 - [Azure][WALA][RHEL-10] Missing man page -Patch6: wla-docs-add-waagent-manpage-3401.patch +Patch5: 0005-Use-systemctl-instead-of-service-to-manager-services.patch +Patch6: 0006-docs-add-waagent-manpage-3401.patch BuildArch: noarch @@ -130,6 +128,11 @@ rm -rf %{_unitdir}/waagent.service.d/ %endif %changelog +* Thu Oct 30 2025 Yuxin Sun - 2.14.0.1-1 +- Rebase to 2.14.0.1 [RHEL-116438] +- Resolves: RHEL-116438 + (Rebase to v2.14.0.1) + * Thu Aug 21 2025 Miroslav Rezanina - 2.13.1.1-2 - wla-Use-systemctl-instead-of-service-to-manager-services.patch [RHEL-109465] - wla-docs-add-waagent-manpage-3401.patch [RHEL-96792] diff --git a/sources b/sources index 7194baa..662611f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v2.13.1.1.tar.gz) = 3cb65495955c746bf112e794cbeb11f47ace72e4272c3cd16eb8d478c0b3b0323890b52c592b68775efafb8c6f267b3614e66f09d6a6dee066b603297676cd38 +SHA512 (v2.14.0.1.tar.gz) = b09c0dc7145f7f6b347c603ddcd5a5b26522b2cd1d37303dcdcb44c41ee710a61e2aab3df0bb5854304de8ed5c7d934c7a6924c9e5c7005e081f66e7d1658db8