import OL open-vm-tools-13.0.0-1.0.1.el10_1.1
This commit is contained in:
parent
48d87f9bf5
commit
41e3ba81a1
2
.gitignore
vendored
2
.gitignore
vendored
@ -3,5 +3,5 @@ cairomm-1.14.5-5.el10.src.rpm
|
||||
glibmm2.4-2.66.6-5.el10.src.rpm
|
||||
gtkmm3.0-3.24.8-6.el10.src.rpm
|
||||
libsigc++20-2.12.1-4.el9.src.rpm
|
||||
open-vm-tools-12.5.0-24276846.tar.gz
|
||||
open-vm-tools-13.0.0-24696409.tar.gz
|
||||
pangomm-2.46.4-2.el10.src.rpm
|
||||
|
||||
25
1003-fix-spaces-in-vmware-udev-rule-for-scsi-devices.patch
Normal file
25
1003-fix-spaces-in-vmware-udev-rule-for-scsi-devices.patch
Normal file
@ -0,0 +1,25 @@
|
||||
From c1bd2508943a462acdde8dd0914a36e9fd5b50c6 Mon Sep 17 00:00:00 2001
|
||||
From: Ashish Samant <ashish.samant@oracle.com>
|
||||
Date: Mon, 15 Aug 2016 15:59:23 -0400
|
||||
Subject: [PATCH] fix spaces in vmware udev rule for scsi devices
|
||||
|
||||
Orabug: 24461968
|
||||
|
||||
Signed-off-by: Ashish Samant <ashish.samant@oracle.com>
|
||||
|
||||
patch forward ported to ol9
|
||||
Signed-off-by: Darren Archibald <darren.archibald@oracle.com>
|
||||
---
|
||||
99-vmware-scsi-timeout.rules | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a//open-vm-tools-11.0.0-1454943499-vmware-scsi-timeout.rules b/open-vm-tools-11.0.0-14549434/99-vmware-scsi-timeout.rules
|
||||
index 598d57a..e3729c0 100644
|
||||
--- a/open-vm-tools-11.0.0-14549434/99-vmware-scsi-timeout.rules
|
||||
+++ b/open-vm-tools-11.0.0-14549434/99-vmware-scsi-timeout.rules
|
||||
@@ -1 +1 @@
|
||||
-ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware ", ATTRS{model}=="Virtual disk ", RUN+="/bin/sh -c 'echo 180 > /sys$DEVPATH/timeout'"
|
||||
+ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware ", ATTRS{model}=="Virtual disk ", RUN+="/bin/sh -c 'echo 180 > /sys$DEVPATH/timeout'"
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
31
add-vmware-udev-rule-for-scsi-devices.patch
Normal file
31
add-vmware-udev-rule-for-scsi-devices.patch
Normal file
@ -0,0 +1,31 @@
|
||||
From ce9da81c7fef3b30f458d191542c8e1029ada361 Mon Sep 17 00:00:00 2001
|
||||
From: Ashish Samant <ashish.samant@oracle.com>
|
||||
Date: Fri, 16 Oct 2015 17:02:29 -0700
|
||||
Subject: [PATCH] add-vmware-udev-rule-for-scsi-devices
|
||||
|
||||
Increase timeout for scsi devices on VMWare guests.
|
||||
|
||||
Orabug: 21819156
|
||||
|
||||
Signed-off-by : Ashish Samant <ashish.samant@oracle.com>
|
||||
Reviewed-by : Todd Vierling <todd.vierling@oracle.com>
|
||||
|
||||
patch forward ported to ol9
|
||||
Signed-off-by: Darren Archibald <darren.archibald@oracle.com>
|
||||
---
|
||||
99-vmware-scsi-timeout.rules | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
create mode 100644 99-vmware-scsi-timeout.rules
|
||||
|
||||
diff --git a/open-vm-tools-11.0.0-14549434/99-vmware-scsi-timeout.rules b/open-vm-tools-11.0.0-14549434/99-vmware-scsi-timeout.rules
|
||||
new file mode 100644
|
||||
index 0000000..1f12d0b
|
||||
--- /dev/null
|
||||
+++ b/open-vm-tools-11.0.0-14549434/99-vmware-scsi-timeout.rules
|
||||
@@ -0,0 +1,3 @@
|
||||
+ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware ",
|
||||
+ATTRS{model}=="Virtual disk ", RUN+="/bin/sh -c 'echo 180
|
||||
+>/sys$DEVPATH/timeout'"
|
||||
--
|
||||
1.8.3.2
|
||||
|
||||
27
fix-vmware-udev-rule-for-scsi-devices.patch
Normal file
27
fix-vmware-udev-rule-for-scsi-devices.patch
Normal file
@ -0,0 +1,27 @@
|
||||
From 629c5112b52bfe8f157879cfd1290d351e624e8e Mon Sep 17 00:00:00 2001
|
||||
From: Ashish Samant <ashish.samant@oracle.com>
|
||||
Date: Wed, 24 Feb 2016 11:45:50 -0500
|
||||
Subject: [PATCH] fix-vmware-udev-rule-for-scsi-devices
|
||||
|
||||
Orabug: 22815019
|
||||
|
||||
Signed-off-by: Ashish Samant <ashish.samant@oracle.com>
|
||||
|
||||
patch forward ported to ol9
|
||||
Signed-off-by: Darren Archibald <darren.archibald@oracle.com>
|
||||
---
|
||||
99-vmware-scsi-timeout.rules | 4 +---
|
||||
1 file changed, 1 insertion(+), 3 deletions(-)
|
||||
|
||||
diff --git a/open-vm-tools-11.0.0-14549434/99-vmware-scsi-timeout.rules b/open-vm-tools-11.0.0-14549434/99-vmware-scsi-timeout.rules
|
||||
index 1f12d0b..598d57a 100644
|
||||
--- a/open-vm-tools-11.0.0-14549434/99-vmware-scsi-timeout.rules
|
||||
+++ b/open-vm-tools-11.0.0-14549434/99-vmware-scsi-timeout.rules
|
||||
@@ -1,3 +1 @@
|
||||
-ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware ",
|
||||
-ATTRS{model}=="Virtual disk ", RUN+="/bin/sh -c 'echo 180
|
||||
->/sys$DEVPATH/timeout'"
|
||||
+ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware ", ATTRS{model}=="Virtual disk ", RUN+="/bin/sh -c 'echo 180 > /sys$DEVPATH/timeout'"
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
@ -18,9 +18,9 @@
|
||||
### Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
################################################################################
|
||||
|
||||
%global majorversion 12.5
|
||||
%global majorversion 13.0
|
||||
%global minorversion 0
|
||||
%global toolsbuild 24276846
|
||||
%global toolsbuild 24696409
|
||||
%global toolsversion %{majorversion}.%{minorversion}
|
||||
%global toolsdaemon vmtoolsd
|
||||
%global vgauthdaemon vgauthd
|
||||
@ -31,7 +31,7 @@
|
||||
|
||||
Name: open-vm-tools
|
||||
Version: %{toolsversion}
|
||||
Release: 1%{?dist}.1
|
||||
Release: 1.0.1%{?dist}.1
|
||||
Summary: Open Virtual Machine Tools for virtual machines hosted on VMware
|
||||
%if 0%{?bundle_gtkmm3}
|
||||
# atkmm: LGPL-2.1-or-later
|
||||
@ -69,6 +69,10 @@ Source104: https://kojihub.stream.rdu2.redhat.com/kojifiles/vol/koji02/pa
|
||||
Source105: https://kojihub.stream.rdu2.redhat.com/kojifiles/vol/koji02/packages/pangomm/2.46.4/2.el10/src/pangomm-2.46.4-2.el10.src.rpm
|
||||
Source106: https://kojihub.stream.rdu2.redhat.com/kojifiles/vol/koji02/packages/gtkmm3.0/3.24.8/6.el10/src/gtkmm3.0-3.24.8-6.el10.src.rpm
|
||||
%endif
|
||||
# Oracle patches
|
||||
Patch1001: add-vmware-udev-rule-for-scsi-devices.patch
|
||||
Patch1002: fix-vmware-udev-rule-for-scsi-devices.patch
|
||||
Patch1003: 1003-fix-spaces-in-vmware-udev-rule-for-scsi-devices.patch
|
||||
|
||||
%if 0%{?rhel} >= 7
|
||||
ExclusiveArch: x86_64 aarch64
|
||||
@ -78,8 +82,12 @@ ExclusiveArch: %{ix86} x86_64 aarch64
|
||||
|
||||
# Patches
|
||||
#Patch0: <patch-name0>.patch
|
||||
# For RHEL-117381 - [CISA Major Incident] CVE-2025-41244 open-vm-tools: Local privilege escalation in open-vm-tools [rhel-10.0.z]
|
||||
Patch1: ovt-Address-CVE-2025-41244.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
|
||||
# For RHEL-117382 - [CISA Major Incident] CVE-2025-41244 open-vm-tools: Local privilege escalation in open-vm-tools [rhel-10.2]
|
||||
Patch2: ovt-Address-CVE-2025-41244.patch
|
||||
# Fix build when compiling with -std=c23 (GCC 15)
|
||||
#Patch1: https://github.com/vmware/open-vm-tools/pull/751.patch
|
||||
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
@ -227,8 +235,6 @@ machines.
|
||||
%build
|
||||
%if 0%{?bundle_gtkmm3}
|
||||
export PATH="%{_buildrootdir}/bin:$PATH"
|
||||
# Cleanup buildroot for existing rpms
|
||||
rm -rf %{_buildrootdir}/*
|
||||
|
||||
function install_rpms_to_current_dir() {
|
||||
PACKAGE_RPM=$(eval echo $1)
|
||||
@ -251,6 +257,13 @@ function install_rpms_to_current_dir() {
|
||||
done
|
||||
}
|
||||
|
||||
rpmbuild_bundled() {
|
||||
rpmbuild --nodeps \
|
||||
--define '_prefix %{bundled_install_path}' \
|
||||
--define '__perl /usr/bin/perl' \
|
||||
$@
|
||||
}
|
||||
|
||||
export LDFLAGS="-L%{_buildrootdir}%{bundled_install_path}/%{_lib} $LDFLAGS"
|
||||
export LDFLAGS="-Wl,-rpath,%{bundled_install_path}/%{_lib} $LDFLAGS"
|
||||
export LDFLAGS="-Wl,-rpath-link,%{_buildrootdir}%{bundled_install_path}/%{_lib} $LDFLAGS"
|
||||
@ -259,7 +272,7 @@ export PATH="%{_buildrootdir}%{bundled_install_path}/bin:$PATH"
|
||||
|
||||
# libsigc++20
|
||||
rpm -ivh %{SOURCE101}
|
||||
rpmbuild --nodeps --define '_prefix %{bundled_install_path}' -ba %{_specdir}/libsigc++20.spec
|
||||
rpmbuild_bundled -ba %{_specdir}/libsigc++20.spec
|
||||
pushd %{_buildrootdir}
|
||||
install_rpms_to_current_dir libsigc++20*.rpm
|
||||
popd
|
||||
@ -269,7 +282,7 @@ sed -i 's@prefix=%{bundled_install_path}@prefix=%{_buildrootdir}%{bundled_instal
|
||||
|
||||
# glibmm2.4
|
||||
rpm -ivh %{SOURCE102}
|
||||
rpmbuild --nodeps --define '_prefix %{bundled_install_path}' -ba %{_specdir}/glibmm2.4.spec
|
||||
rpmbuild_bundled -ba %{_specdir}/glibmm2.4.spec
|
||||
pushd %{_buildrootdir}
|
||||
install_rpms_to_current_dir glibmm2.4*.rpm
|
||||
popd
|
||||
@ -279,7 +292,7 @@ sed -i 's@prefix=%{bundled_install_path}@prefix=%{_buildrootdir}%{bundled_instal
|
||||
|
||||
# atkmm
|
||||
rpm -ivh %{SOURCE103}
|
||||
rpmbuild --nodeps --define '_prefix %{bundled_install_path}' -ba %{_specdir}/atkmm.spec
|
||||
rpmbuild_bundled -ba %{_specdir}/atkmm.spec
|
||||
pushd %{_buildrootdir}
|
||||
install_rpms_to_current_dir atkmm*.rpm
|
||||
popd
|
||||
@ -289,7 +302,7 @@ sed -i 's@prefix=%{bundled_install_path}@prefix=%{_buildrootdir}%{bundled_instal
|
||||
|
||||
# cairomm
|
||||
rpm -ivh %{SOURCE104}
|
||||
rpmbuild --nodeps --define '_prefix %{bundled_install_path}' --without=doc_pdf -ba %{_specdir}/cairomm.spec
|
||||
rpmbuild_bundled --without=doc_pdf -ba %{_specdir}/cairomm.spec
|
||||
pushd %{_buildrootdir}
|
||||
install_rpms_to_current_dir cairomm*.rpm
|
||||
popd
|
||||
@ -299,7 +312,7 @@ sed -i 's@prefix=%{bundled_install_path}@prefix=%{_buildrootdir}%{bundled_instal
|
||||
|
||||
# pangomm
|
||||
rpm -ivh %{SOURCE105}
|
||||
rpmbuild --nodeps --define '_prefix %{bundled_install_path}' -ba %{_specdir}/pangomm.spec
|
||||
rpmbuild_bundled -ba %{_specdir}/pangomm.spec
|
||||
pushd %{_buildrootdir}
|
||||
install_rpms_to_current_dir pangomm*.rpm
|
||||
popd
|
||||
@ -309,7 +322,7 @@ sed -i 's@prefix=%{bundled_install_path}@prefix=%{_buildrootdir}%{bundled_instal
|
||||
|
||||
# gtkmm3.0
|
||||
rpm -ivh %{SOURCE106}
|
||||
rpmbuild --nodeps --define '_prefix %{bundled_install_path}' -ba %{_specdir}/gtkmm3.0.spec
|
||||
rpmbuild_bundled -ba %{_specdir}/gtkmm3.0.spec
|
||||
pushd %{_buildrootdir}
|
||||
install_rpms_to_current_dir gtkmm*.rpm
|
||||
popd
|
||||
@ -420,9 +433,6 @@ find %{buildroot}%{_libdir} -name '*.la' -delete
|
||||
rm -fr %{buildroot}%{_defaultdocdir}
|
||||
rm -f docs/api/build/html/FreeSans.ttf
|
||||
|
||||
# Remove mount.vmhgfs & symlink
|
||||
rm -fr %{buildroot}%{_sbindir} %{buildroot}/sbin/mount.vmhgfs
|
||||
|
||||
# Systemd unit files
|
||||
install -p -m 644 -D %{SOURCE1} %{buildroot}%{_unitdir}/%{toolsdaemon}.service
|
||||
install -p -m 644 -D %{SOURCE2} %{buildroot}%{_unitdir}/%{vgauthdaemon}.service
|
||||
@ -622,10 +632,23 @@ fi
|
||||
%{_bindir}/vmware-vgauth-smoketest
|
||||
|
||||
%changelog
|
||||
* Mon Oct 06 2025 Miroslav Rezanina <mrezanin@redhat.com> - 12.5.0-1.el10_0.1
|
||||
- ovt-Address-CVE-2025-41244.patch [RHEL-117381]
|
||||
- Resolves: RHEL-117381
|
||||
([CISA Major Incident] CVE-2025-41244 open-vm-tools: Local privilege escalation in open-vm-tools [rhel-10.0.z])
|
||||
* Tue Oct 21 2025 EL Errata <el-errata_ww@oracle.com> - 13.0.0-1.0.1
|
||||
- Fix spaces in vmware udev rule for scsi devices [Orabug: 24461968]
|
||||
- Fix vmware udev rule in 99-vmware-scsi-timeout.rules file. [Orabug: 22815019]
|
||||
- Increase timeout for scsi devices on VMWare guests by adding a udev rule. [Orabug: 21819156]
|
||||
|
||||
* Mon Oct 06 2025 Miroslav Rezanina <mrezanin@redhat.com> - 13.0.0-1.1
|
||||
- ovt-Handle-new-cloud-init-error-code-and-status.patch [RHEL-99781]
|
||||
- ovt-Address-CVE-2025-41244.patch [RHEL-117382]
|
||||
- Resolves: RHEL-99781
|
||||
(Cloud-init receives TERM signal from PID 1 in the middle of running user data [rhel-10])
|
||||
- Resolves: RHEL-117382
|
||||
([CISA Major Incident] CVE-2025-41244 open-vm-tools: Local privilege escalation in open-vm-tools [rhel-10.2])
|
||||
|
||||
* Thu Jul 24 2025 Bo Yang <boyang@redhat.com> - 13.0.0-1
|
||||
- Rebase to 13.0.0 [RHEL-99156]
|
||||
- Resolves: RHEL-99156
|
||||
([ESXi][RHEL10] open-vm-tools version 13.0.0 has been released - please rebase)
|
||||
|
||||
* Tue Dec 03 2024 Miroslav Rezanina <mrezanin@redhat.com> - 12.5.0-1
|
||||
- Rebase to 12.5.0 [RHEL-63092]
|
||||
|
||||
@ -1,22 +1,22 @@
|
||||
From 3e0e4298b8903db299d4d43dd73d87fbb02ebfae Mon Sep 17 00:00:00 2001
|
||||
From f5f0a81af7f6b2681818a4b679e701c6624f148e Mon Sep 17 00:00:00 2001
|
||||
From: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||||
Date: Wed, 1 Oct 2025 10:33:32 +0200
|
||||
Subject: [PATCH] Address CVE-2025-41244
|
||||
Date: Wed, 1 Oct 2025 10:00:09 +0200
|
||||
Subject: [PATCH 2/2] Address CVE-2025-41244
|
||||
|
||||
RH-Author: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||||
RH-MergeRequest: 55: Address CVE-2025-41244
|
||||
RH-Jira: RHEL-117381
|
||||
RH-MergeRequest: 13: Address CVE-2025-41244
|
||||
RH-Jira: RHEL-117382
|
||||
RH-Acked-by: roverflow <None>
|
||||
RH-Acked-by: Maxim Levitsky <None>
|
||||
RH-Acked-by: Ani Sinha <anisinha@redhat.com>
|
||||
RH-Commit: [1/1] db5ed6bb2a27598057e12b626913cfc3adc5f945
|
||||
RH-Commit: [1/1] 24479069095a468673d67a3f332fc69337abf400 (vkuznets/open-vm-tools)
|
||||
|
||||
JIRA: https://issues.redhat.com/browse/RHEL-117381
|
||||
JIRA: https://issues.redhat.com/browse/RHEL-117382
|
||||
CVE: CVE-2025-41244
|
||||
|
||||
commit 7ed196cf01f8acd09011815a605b6733894b8aab
|
||||
commit 3ab0685c1cf7981c84898d546a73d6db6dcd3823
|
||||
Author: Kruti Pendharkar <kp025370@broadcom.com>
|
||||
Date: Mon Sep 29 01:02:40 2025 -0700
|
||||
Date: Mon Sep 29 23:03:43 2025 -0700
|
||||
|
||||
Address CVE-2025-41244
|
||||
- Disable (default) the execution of the SDMP get-versions.sh script.
|
||||
@ -26,22 +26,21 @@ Date: Mon Sep 29 01:02:40 2025 -0700
|
||||
|
||||
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||||
---
|
||||
.../serviceDiscovery/serviceDiscovery.c | 37 ++++++++++++++++---
|
||||
1 file changed, 32 insertions(+), 5 deletions(-)
|
||||
.../serviceDiscovery/serviceDiscovery.c | 36 ++++++++++++++++---
|
||||
1 file changed, 31 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/open-vm-tools/services/plugins/serviceDiscovery/serviceDiscovery.c b/open-vm-tools/services/plugins/serviceDiscovery/serviceDiscovery.c
|
||||
index e35f1c00..bf4edd5c 100644
|
||||
index 0da598f1..5e9772e9 100644
|
||||
--- a/open-vm-tools/services/plugins/serviceDiscovery/serviceDiscovery.c
|
||||
+++ b/open-vm-tools/services/plugins/serviceDiscovery/serviceDiscovery.c
|
||||
@@ -1,5 +1,6 @@
|
||||
@@ -1,5 +1,5 @@
|
||||
/*********************************************************
|
||||
- * Copyright (c) 2020-2021,2023 VMware, Inc. All rights reserved.
|
||||
- * Copyright (c) 2020-2024 Broadcom. All Rights Reserved.
|
||||
+ * Copyright (c) 2020-2025 Broadcom. All Rights Reserved.
|
||||
+ * The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
|
||||
* The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU Lesser General Public License as published
|
||||
@@ -121,6 +122,12 @@ static gchar* scriptInstallDir = NULL;
|
||||
@@ -122,6 +122,12 @@ static gchar* scriptInstallDir = NULL;
|
||||
#define CONFNAME_SERVICEDISCOVERY_CACHEDATA "cache-data"
|
||||
#define SERVICE_DISCOVERY_CONF_DEFAULT_CACHEDATA TRUE
|
||||
|
||||
@ -54,7 +53,7 @@ index e35f1c00..bf4edd5c 100644
|
||||
/*
|
||||
* Define the configuration to require at least one subscriber subscribed for
|
||||
* the gdp message.
|
||||
@@ -1260,23 +1267,27 @@ ServiceDiscoveryServerShutdown(gpointer src,
|
||||
@@ -1265,23 +1271,27 @@ ServiceDiscoveryServerShutdown(gpointer src,
|
||||
*
|
||||
* Construct final paths of the scripts that will be used for execution.
|
||||
*
|
||||
@ -84,7 +83,7 @@ index e35f1c00..bf4edd5c 100644
|
||||
if (scriptInstallDir == NULL) {
|
||||
#if defined(OPEN_VM_TOOLS)
|
||||
scriptInstallDir = Util_SafeStrdup(VMTOOLS_SERVICE_DISCOVERY_SCRIPTS);
|
||||
@@ -1288,6 +1299,15 @@ ConstructScriptPaths(void)
|
||||
@@ -1293,6 +1303,15 @@ ConstructScriptPaths(void)
|
||||
#endif
|
||||
}
|
||||
for (i = 0; i < ARRAYSIZE(gKeyScripts); ++i) {
|
||||
@ -100,7 +99,7 @@ index e35f1c00..bf4edd5c 100644
|
||||
KeyNameValue tmp;
|
||||
tmp.keyName = g_strdup_printf("%s", gKeyScripts[i].keyName);
|
||||
#if defined(_WIN32)
|
||||
@@ -1295,7 +1315,8 @@ ConstructScriptPaths(void)
|
||||
@@ -1300,7 +1319,8 @@ ConstructScriptPaths(void)
|
||||
#else
|
||||
tmp.val = g_strdup_printf("%s%s%s", scriptInstallDir, DIRSEPS, gKeyScripts[i].val);
|
||||
#endif
|
||||
@ -110,7 +109,7 @@ index e35f1c00..bf4edd5c 100644
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1361,14 +1382,20 @@ ToolsOnLoad(ToolsAppCtx *ctx)
|
||||
@@ -1366,14 +1386,20 @@ ToolsOnLoad(ToolsAppCtx *ctx)
|
||||
}
|
||||
};
|
||||
gboolean disabled;
|
||||
|
||||
74
ovt-Handle-new-cloud-init-error-code-and-status.patch
Normal file
74
ovt-Handle-new-cloud-init-error-code-and-status.patch
Normal file
@ -0,0 +1,74 @@
|
||||
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
@ -3,5 +3,5 @@ SHA512 (cairomm-1.14.5-5.el10.src.rpm) = 2d036e83c63dd29a1933542de2274d74b4e6310
|
||||
SHA512 (glibmm2.4-2.66.6-5.el10.src.rpm) = 78cd5d54f1ef9faf2be75f22550b5ec60b55f6c4345df91db95889762f606a0649905077934527b98ba325212bb460a19deadef9eea15bb0c50915e560621d4c
|
||||
SHA512 (gtkmm3.0-3.24.8-6.el10.src.rpm) = e0e4c3c57cf384928c39b22ae81276ff9f2f34e7aa6914f7d9a3ce65b5e170d7d2edaa61678b8f2ac2e5b16072d796af74ca51ad560b6fc539c7796f318fa6eb
|
||||
SHA512 (libsigc++20-2.12.1-4.el9.src.rpm) = cdb1800b2413794e83623871b2ca2cade0b444e0a90f6948e1f3f449cd92e10beb3dd76471023f95e4f795693b3ded09bc83f551a54dab065fdee5dbf67e9a40
|
||||
SHA512 (open-vm-tools-12.5.0-24276846.tar.gz) = 068f84192b7056144257a8180884a077fe03e34c441f4eb7729112d3dbd75f70e019d3cdbfe7c25243154d7597f152272efde9417d873a585ec1bfc68f34e234
|
||||
SHA512 (open-vm-tools-13.0.0-24696409.tar.gz) = eacb304f3c00d901ea2afffb09bb26be25b6b10df1de4f1818e7ce07a8c05b5e243c8fbe00a5fbf2680ad5b42727315f5c3fb9af818658ffc2b9425d3f34c37e
|
||||
SHA512 (pangomm-2.46.4-2.el10.src.rpm) = ab9a723b4a90504101d544335333d9a2ec3c7558101c7005cc69aa05c115f4639d7e4110fb5a856f48e35ea062a5450adddca05f6866263fa8f20b8cecd12e6e
|
||||
|
||||
Loading…
Reference in New Issue
Block a user