diff --git a/SOURCES/1003-fix-spaces-in-vmware-udev-rule-for-scsi-devices.patch b/SOURCES/1003-fix-spaces-in-vmware-udev-rule-for-scsi-devices.patch deleted file mode 100644 index 40bd903..0000000 --- a/SOURCES/1003-fix-spaces-in-vmware-udev-rule-for-scsi-devices.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c1bd2508943a462acdde8dd0914a36e9fd5b50c6 Mon Sep 17 00:00:00 2001 -From: Ashish Samant -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 - -patch forward ported to ol9 -Signed-off-by: Darren Archibald ---- - 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 - diff --git a/SOURCES/add-vmware-udev-rule-for-scsi-devices.patch b/SOURCES/add-vmware-udev-rule-for-scsi-devices.patch deleted file mode 100644 index 5839e41..0000000 --- a/SOURCES/add-vmware-udev-rule-for-scsi-devices.patch +++ /dev/null @@ -1,31 +0,0 @@ -From ce9da81c7fef3b30f458d191542c8e1029ada361 Mon Sep 17 00:00:00 2001 -From: Ashish Samant -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 -Reviewed-by : Todd Vierling - -patch forward ported to ol9 -Signed-off-by: Darren Archibald ---- - 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 - diff --git a/SOURCES/fix-vmware-udev-rule-for-scsi-devices.patch b/SOURCES/fix-vmware-udev-rule-for-scsi-devices.patch deleted file mode 100644 index 5ba9c78..0000000 --- a/SOURCES/fix-vmware-udev-rule-for-scsi-devices.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 629c5112b52bfe8f157879cfd1290d351e624e8e Mon Sep 17 00:00:00 2001 -From: Ashish Samant -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 - -patch forward ported to ol9 -Signed-off-by: Darren Archibald ---- - 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 - diff --git a/SPECS/open-vm-tools.spec b/SPECS/open-vm-tools.spec index 4856b51..1ab3a17 100644 --- a/SPECS/open-vm-tools.spec +++ b/SPECS/open-vm-tools.spec @@ -31,7 +31,7 @@ Name: open-vm-tools Version: %{toolsversion} -Release: 1.0.1%{?dist}.2 +Release: 1%{?dist}.2 Summary: Open Virtual Machine Tools for virtual machines hosted on VMware License: GPLv2 URL: https://github.com/vmware/%{name} @@ -43,11 +43,6 @@ Source3: run-vmblock\x2dfuse.mount Source4: open-vm-tools.conf Source5: vmtoolsd.pam -# 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 %else @@ -427,11 +422,6 @@ fi %{_bindir}/vmware-vgauth-smoketest %changelog -* Tue Oct 07 2025 EL Errata - 12.5.0-1.0.1.2 -- 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 - 12.5.0-1.el9_6.2 - ovt-Address-CVE-2025-41244.patch [RHEL-117390] - Resolves: RHEL-117390