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

* Tue Jan 06 2026 Jon Maloy <jmaloy@redhat.com> - 2.14.0.1-3

Browse Source 
- wla-Jira-https-issues.redhat.com-browse-RHEL-133507.patch [RHEL-133507]
- Resolves: RHEL-133507
  (Backport ConditionVirtualization=|microsoft for waagent in RHEL 9.x)
This commit is contained in:
Jon Maloy 2026-01-06 15:21:14 -05:00
parent 47694d9253
commit ca4eec4f0c
2 changed files with 91 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
WALinuxAgent.spec
View File

@ -4,7 +4,7 @@
Name: WALinuxAgent
Version: 2.14.0.1
Release: 2%{?dist}
Release: 3%{?dist}
Summary: The Microsoft Azure Linux Agent
License: ASL 2.0
@ -21,6 +21,8 @@ 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 RHEL-133507 - Backport ConditionVirtualization=|microsoft for waagent in RHEL 9.x
Patch7: wla-Jira-https-issues.redhat.com-browse-RHEL-133507.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
@ -162,6 +164,11 @@ rm -rf %{_unitdir}/waagent.service.d/
%endif
%changelog
* Tue Jan 06 2026 Jon Maloy <jmaloy@redhat.com> - 2.14.0.1-3
- wla-Jira-https-issues.redhat.com-browse-RHEL-133507.patch [RHEL-133507]
- Resolves: RHEL-133507
(Backport ConditionVirtualization=|microsoft for waagent in RHEL 9.x)
* Wed Nov 12 2025 Miroslav Rezanina <mrezanin@redhat.com> - 2.14.0.1-2
- wla-Remove-10-azure-unmanaged-sriov.rules.patch [RHEL-124218]
- Resolves: RHEL-124218

83
wla-Jira-https-issues.redhat.com-browse-RHEL-133507.patch Normal file
View File

@ -0,0 +1,83 @@
From 950482d0e2147546dbb00d064937e6375bf860d4 Mon Sep 17 00:00:00 2001
From: Chris Patterson <cpatterson@microsoft.com>
Date: Thu, 1 Sep 2022 10:45:47 -0400
Subject: [PATCH] Jira: https://issues.redhat.com/browse/RHEL-133507
RH-Author: yuxisun <None>
RH-MergeRequest: 25: waagent.service: set ConditionVirtualization=|microsoft
RH-Jira: RHEL-133507
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
RH-Commit: [1/1] 667b85d61146b144ba24baf41156ae32e301b194 (yuxisun/centos_src_WALinuxAgent)
waagent.service: set ConditionVirtualization=|microsoft
Only start waagent service when running under Microsoft virtualization.
Set it as a triggering condition to make it easier for downstreams or
test setups to add another condition (i.e. run outside of hyperv).
Signed-off-by: Chris Patterson <cpatterson@microsoft.com>
(cherry picked from commit d1fad5317e2dac9fc82d9c56d2d016e20db5f7a2)
Downstream only
Signed-off-by: Yuxin Sun <yuxisun@redhat.com>
---
bin/waagent2.0 | 1 +
init/redhat/py2/waagent.service | 1 +
init/redhat/waagent.service | 1 +
init/waagent.service | 1 +
4 files changed, 4 insertions(+)
diff --git a/bin/waagent2.0 b/bin/waagent2.0
index 34732677..c84c8c40 100644
--- a/bin/waagent2.0
+++ b/bin/waagent2.0
@@ -1569,6 +1569,7 @@ After=network.target
After=sshd.service
ConditionFileIsExecutable=/usr/sbin/waagent
ConditionPathExists=/etc/waagent.conf
+ConditionVirtualization=|microsoft
[Service]
Type=simple
diff --git a/init/redhat/py2/waagent.service b/init/redhat/py2/waagent.service
index 920e0ec7..46254ec3 100644
--- a/init/redhat/py2/waagent.service
+++ b/init/redhat/py2/waagent.service
@@ -5,6 +5,7 @@ After=network-online.target
ConditionFileIsExecutable=/usr/sbin/waagent
ConditionPathExists=/etc/waagent.conf
+ConditionVirtualization=|microsoft
[Service]
Type=simple
diff --git a/init/redhat/waagent.service b/init/redhat/waagent.service
index 2c6ac5d8..12d5feee 100644
--- a/init/redhat/waagent.service
+++ b/init/redhat/waagent.service
@@ -5,6 +5,7 @@ After=network-online.target
ConditionFileIsExecutable=/usr/sbin/waagent
ConditionPathExists=/etc/waagent.conf
+ConditionVirtualization=|microsoft
[Service]
Type=simple
diff --git a/init/waagent.service b/init/waagent.service
index e91f1433..aa1f3203 100644
--- a/init/waagent.service
+++ b/init/waagent.service
@@ -5,6 +5,7 @@ After=network-online.target
ConditionFileIsExecutable=/usr/sbin/waagent
ConditionPathExists=/etc/waagent.conf
+ConditionVirtualization=|microsoft
[Service]
Type=simple
--
2.52.0