* Mon Feb 16 2026 Bo Yang <boyang@redhat.com> - 13.0.10-1
- Rebase to 13.0.10 [RHEL-144577] - Resolves: RHEL-144577 ([ESXi][RHEL10] open-vm-tools version 13.0.10 has been released - please rebase)
This commit is contained in:
parent
e233899b30
commit
9c75e724a5
1
.gitignore
vendored
1
.gitignore
vendored
@ -41,3 +41,4 @@
|
||||
/open-vm-tools-12.5.0-24276846.tar.gz
|
||||
/open-vm-tools-13.0.0-24696409.tar.gz
|
||||
/open-vm-tools-13.0.5-24915695.tar.gz
|
||||
/open-vm-tools-13.0.10-25056151.tar.gz
|
||||
|
||||
@ -19,8 +19,8 @@
|
||||
################################################################################
|
||||
|
||||
%global majorversion 13.0
|
||||
%global minorversion 5
|
||||
%global toolsbuild 24915695
|
||||
%global minorversion 10
|
||||
%global toolsbuild 25056151
|
||||
%global toolsversion %{majorversion}.%{minorversion}
|
||||
%global toolsdaemon vmtoolsd
|
||||
%global vgauthdaemon vgauthd
|
||||
@ -78,8 +78,6 @@ ExclusiveArch: %{ix86} x86_64 aarch64
|
||||
|
||||
# Patches
|
||||
#Patch0: <patch-name0>.patch
|
||||
# For RHEL-99781 - Cloud-init receives TERM signal from PID 1 in the middle of running user data [rhel-10]
|
||||
Patch1: ovt-Handle-new-cloud-init-error-code-and-status.patch
|
||||
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
@ -624,6 +622,11 @@ fi
|
||||
%{_bindir}/vmware-vgauth-smoketest
|
||||
|
||||
%changelog
|
||||
* Mon Feb 16 2026 Bo Yang <boyang@redhat.com> - 13.0.10-1
|
||||
- Rebase to 13.0.10 [RHEL-144577]
|
||||
- Resolves: RHEL-144577
|
||||
([ESXi][RHEL10] open-vm-tools version 13.0.10 has been released - please rebase)
|
||||
|
||||
* Mon Nov 03 2025 Bo Yang <boyang@redhat.com> - 13.0.5-1
|
||||
- Rebase to 13.0.5 [RHEL-118504]
|
||||
- Resolves: RHEL-118504
|
||||
|
||||
@ -1,74 +0,0 @@
|
||||
From 6c4130754b183c929b5092bab516c6391974ddcb Mon Sep 17 00:00:00 2001
|
||||
From: Pengpeng Sun <pengpeng.sun@broadcom.com>
|
||||
Date: Wed, 27 Aug 2025 14:19:58 +0800
|
||||
Subject: [PATCH 1/2] Handle new cloud-init error code and status
|
||||
|
||||
RH-Author: Ani Sinha <anisinha@redhat.com>
|
||||
RH-MergeRequest: 12: Handle new cloud-init error code and status
|
||||
RH-Jira: RHEL-99781
|
||||
RH-Acked-by: xiachen <xiachen@redhat.com>
|
||||
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
RH-Commit: [1/1] 40a705507363b9e508fcc50250d51c8eca7e81a3 (anisinha/centos-open-vm-tools)
|
||||
|
||||
- A new error code [1] was introduced in cloud-init v23.4, RedHat team reported
|
||||
that our OVT code shall handle this new error code properly, see
|
||||
https://github.com/vmware/open-vm-tools/issues/768.
|
||||
This change follows the backwards-compatible way in
|
||||
https://cloudinit.readthedocs.io/en/latest/explanation/return_codes.html
|
||||
to check that the return code is not equal to 1.
|
||||
|
||||
- Running status has been changed from "not run" to "not started" in
|
||||
cloud-init v24.1, see details in
|
||||
https://github.com/canonical/cloud-init/commit/d175170aedc1398b85ac767573b8773a5a2e7c6f.
|
||||
This change adds "not started" match to CLOUDINIT_STATUS_NOT_RUN.
|
||||
|
||||
This patch was sent by John Wolfe over email and has been pushed upstream here:
|
||||
https://github.com/vmware/open-vm-tools/blob/Handle-new-cloud-init-error-code.patch/
|
||||
|
||||
Addresses open-vm-tools issue https://github.com/vmware/open-vm-tools/issues/768
|
||||
|
||||
This change has been tested internally by Amy Chen and is seen to fix the
|
||||
original issue.
|
||||
|
||||
1. https://cloudinit.readthedocs.io/en/latest/explanation/failure_states.html#error-codes
|
||||
|
||||
Signed-off-by: Ani Sinha <anisinha@redhat.com>
|
||||
---
|
||||
open-vm-tools/libDeployPkg/linuxDeployment.c | 10 +++++++---
|
||||
1 file changed, 7 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/open-vm-tools/libDeployPkg/linuxDeployment.c b/open-vm-tools/libDeployPkg/linuxDeployment.c
|
||||
index 44cac8ef..82e83957 100644
|
||||
--- a/open-vm-tools/libDeployPkg/linuxDeployment.c
|
||||
+++ b/open-vm-tools/libDeployPkg/linuxDeployment.c
|
||||
@@ -1313,6 +1313,7 @@ static CLOUDINIT_STATUS_CODE
|
||||
GetCloudinitStatus() {
|
||||
// Cloud-init execution status messages
|
||||
static const char* NOT_RUN = "not run";
|
||||
+ static const char* NOT_STARTED = "not started";
|
||||
static const char* RUNNING = "running";
|
||||
static const char* DONE = "done";
|
||||
static const char* ERROR = "error";
|
||||
@@ -1326,13 +1327,16 @@ GetCloudinitStatus() {
|
||||
false,
|
||||
cloudinitStatusCmdOutput,
|
||||
MAX_LENGTH_CLOUDINIT_STATUS);
|
||||
- if (forkExecResult != 0) {
|
||||
- sLog(log_info, "Unable to get cloud-init status.");
|
||||
- return CLOUDINIT_STATUS_UNKNOWN;
|
||||
+ if (forkExecResult == 1) {
|
||||
+ sLog(log_info, "Cloud-init experienced unrecoverable error.");
|
||||
+ return CLOUDINIT_STATUS_ERROR;
|
||||
} else {
|
||||
if (strstr(cloudinitStatusCmdOutput, NOT_RUN) != NULL) {
|
||||
sLog(log_info, "Cloud-init status is '%s'.", NOT_RUN);
|
||||
return CLOUDINIT_STATUS_NOT_RUN;
|
||||
+ } else if (strstr(cloudinitStatusCmdOutput, NOT_STARTED) != NULL) {
|
||||
+ sLog(log_info, "Cloud-init status is '%s'.", NOT_STARTED);
|
||||
+ return CLOUDINIT_STATUS_NOT_RUN;
|
||||
} else if (strstr(cloudinitStatusCmdOutput, RUNNING) != NULL) {
|
||||
sLog(log_info, "Cloud-init status is '%s'.", RUNNING);
|
||||
return CLOUDINIT_STATUS_RUNNING;
|
||||
--
|
||||
2.47.3
|
||||
|
||||
2
sources
2
sources
@ -1,4 +1,4 @@
|
||||
SHA512 (open-vm-tools-13.0.5-24915695.tar.gz) = e8a0c823e8430e3df0873f8031704536e73bec21d4cd37c37a37053fe2a5116ae1d2fdfa05eae95910c22238c967acc96f6603e1dd8289f2ca926507040c757a
|
||||
SHA512 (open-vm-tools-13.0.10-25056151.tar.gz) = c332fd2efb3bc16f2fbb77b7b0d0f4a5bb251b5b4828260bb6cbd96903a38d492f90727dad54ef95e442cf3dcc043032e5581e64e3aee4afb55b9db568a29259
|
||||
SHA512 (atkmm-2.28.4-2.el10.src.rpm) = 55953c3221c228433e720b28517c1d23faba1091eb5d81be6522c096b7cf42828eaefe1c330aa2ca0b058188cf4ddd8549463d5817949a5a31efead72097d04e
|
||||
SHA512 (cairomm-1.14.5-5.el10.src.rpm) = 2d036e83c63dd29a1933542de2274d74b4e63100d90dfd559eabdd00333ac4dd1ca25d810f5180c1c1afd71cd985376e7700beaff4f385132200c75633bfc980
|
||||
SHA512 (glibmm2.4-2.66.6-5.el10.src.rpm) = 78cd5d54f1ef9faf2be75f22550b5ec60b55f6c4345df91db95889762f606a0649905077934527b98ba325212bb460a19deadef9eea15bb0c50915e560621d4c
|
||||
|
||||
Loading…
Reference in New Issue
Block a user