rpms/open-vm-tools
6
0
Fork 1
Code Issues Pull Requests Releases Activity

Revert OL modifications

Browse Source
This commit is contained in:
eabdullin 2025-10-08 09:07:26 +00:00
parent 628b14e311
commit 48d87f9bf5
4 changed files with 1 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
1003-fix-spaces-in-vmware-udev-rule-for-scsi-devices.patch
View File

@ -1,25 +0,0 @@
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
View File

@ -1,31 +0,0 @@
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
View File

@ -1,27 +0,0 @@
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

11
open-vm-tools.spec
View File

@ -31,7 +31,7 @@
Name: open-vm-tools
Version: %{toolsversion}
Release: 1.0.1%{?dist}.1
Release: 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,10 +69,6 @@ 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
@ -626,11 +622,6 @@ fi
%{_bindir}/vmware-vgauth-smoketest
%changelog
* Tue Oct 07 2025 Darren Archibald <darren.archibald@oracle.com> - 12.5.0-1.0.1.el10_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> - 12.5.0-1.el10_0.1
- ovt-Address-CVE-2025-41244.patch [RHEL-117381]
- Resolves: RHEL-117381