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

import WALinuxAgent-2.7.0.6-8.el8_8

This commit is contained in:
CentOS Sources 2023-05-16 06:22:20 +00:00 committed by Stepan Oksanichenko
parent d3d0edde8f
commit 20ff44c6f7
2 changed files with 61 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
SOURCES/wla-Use-platform-python-in-waagent.service.patch Normal file
View File

@ -0,0 +1,45 @@
From 85638d1238ba9ab0c77138133ab1b7c7069e3821 Mon Sep 17 00:00:00 2001
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Tue, 21 Feb 2023 10:29:52 +0100
Subject: [PATCH 2/2] Use platform-python in waagent.service
RH-Author: Vitaly Kuznetsov <vkuznets@redhat.com>
RH-MergeRequest: 16: Use platform-python in waagent.service
RH-Bugzilla: 2170104
RH-Acked-by: Mohamed Gamal Morsy <mmorsy@redhat.com>
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
RH-Commit: [2/2] e548a4d37bd89e6e2eb471b5193b76f1f9f9529b
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2170104
Upstream: RHEL only
WALinuxAgent in RHEL8 uses platform-python, which is python3.6.
'waagent.service', however, overrides this by calling
'/usr/bin/python3' directly and in case this point to a newer
AppStream Python (e.g. Python3.9) WALinuxAgent breaks as it can't
find its files.
See also: https://github.com/Azure/WALinuxAgent/issues/2728
See also: https://github.com/Azure/WALinuxAgent/pull/2729
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
---
init/redhat/waagent.service | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/init/redhat/waagent.service b/init/redhat/waagent.service
index dc11fbb1..29056395 100644
--- a/init/redhat/waagent.service
+++ b/init/redhat/waagent.service
@@ -8,7 +8,7 @@ ConditionPathExists=/etc/waagent.conf
[Service]
Type=simple
-ExecStart=/usr/bin/python3 -u /usr/sbin/waagent -daemon
+ExecStart=/usr/sbin/waagent -daemon
Restart=always
RestartSec=5
Slice=azure.slice
--
2.37.3

17
SPECS/WALinuxAgent.spec
View File

@ -1,7 +1,7 @@
Summary: Microsoft Azure Linux Agent
Name: WALinuxAgent
Version: 2.7.0.6
Release: 6%{?dist}
Release: 8%{?dist}
License: ASL 2.0
Group: Development/Libraries
@ -17,6 +17,8 @@ Patch0003: wla-redhat-Fix-command-sequence-for-restarting-net-inter.patch
Patch4: wla-redhat-Use-NetworkManager-to-set-DHCP-hostnames-on-r.patch
# For bz#2114824 - [Azure][WALA][RHEL-8.7] The description of "Logs.Collect" is incorrect
Patch5: wla-Update-Log-Collector-default-in-Comments-and-Readme-.patch
# For bz#2170104 - [Azure][WALA][RHEL-8] systemd service should not use python3
Patch6: wla-Use-platform-python-in-waagent.service.patch
# rhel requirements
BuildRequires: python3-devel
@ -54,6 +56,7 @@ Udev rules specific to Microsoft Azure Virtual Machines.
%patch0003 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%build
%py3_build
@ -93,6 +96,18 @@ rm -rf %{_unitdir}/waagent.service.d/
%{_udevrulesdir}/*.rules
%changelog
* Mon Mar 06 2023 Jon Maloy <jmaloy@redhat.com> - 2.7.0.6-8.el8_8
- wla-redhat-Fix-frh.py-to-not-skip-valid-patches-to-init-.patch [bz#2170104]
- wla-Use-platform-python-in-waagent.service.patch [bz#2170104]
- Resolves: bz#2170104
([Azure][WALA][RHEL-8] systemd service should not use python3)
* Mon Mar 06 2023 Jon Maloy <jmaloy@redhat.com> - 2.7.0.6-7.el8_8
- wla-redhat-Fix-frh.py-to-not-skip-valid-patches-to-init-.patch [bz#2170104]
- wla-Use-platform-python-in-waagent.service.patch [bz#2170104]
- Resolves: bz#2170104
([Azure][WALA][RHEL-8] systemd service should not use python3)
* Mon Aug 29 2022 Miroslav Rezanina <mrezanin@redhat.com> - 2.7.0.6-6
- wla-redhat-Remove-files-inside-WALA-services-directory.patch [bz#2114742]
- Resolves: bz#2114742