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

Use systemd-detect-virt to detect VMware platform (RHBZ#1251656)

Browse Source
This commit is contained in:
Ravindra Kumar 2016-06-20 12:44:40 -07:00
parent 4d77ec2dd6
commit 1b78bdae39
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
open-vm-tools.spec
View File

@ -28,7 +28,7 @@
Name: open-vm-tools Name: open-vm-tools
Version: %{toolsversion} Version: %{toolsversion}
Release: 2%{?dist} Release: 3%{?dist}
Summary: Open Virtual Machine Tools for virtual machines hosted on VMware Summary: Open Virtual Machine Tools for virtual machines hosted on VMware
Group: Applications/System Group: Applications/System
License: GPLv2 License: GPLv2
@ -190,8 +190,11 @@ if [ -f %{_bindir}/vmware-guestproxycerttool ]; then
fi fi
# Setup mount point for Shared Folders # Setup mount point for Shared Folders
# NOTE: Use systemd-detect-virt to detect VMware platform because
# vmware-checkvm might misbehave on non-VMware platforms.
if [ -f %{_bindir}/vmware-checkvm -a \ if [ -f %{_bindir}/vmware-checkvm -a \
-f %{_bindir}/vmhgfs-fuse ] && \ -f %{_bindir}/vmhgfs-fuse ] && \
%{_bindir}/systemd-detect-virt | grep -iq VMware && \
%{_bindir}/vmware-checkvm &> /dev/null && \ %{_bindir}/vmware-checkvm &> /dev/null && \
%{_bindir}/vmware-checkvm -p | grep -q Workstation && \ %{_bindir}/vmware-checkvm -p | grep -q Workstation && \
%{_bindir}/vmhgfs-fuse -e &> /dev/null; then %{_bindir}/vmhgfs-fuse -e &> /dev/null; then
@ -208,6 +211,7 @@ fi
if [ "$1" = "0" -a \ if [ "$1" = "0" -a \
-f %{_bindir}/vmware-checkvm ] && \ -f %{_bindir}/vmware-checkvm ] && \
%{_bindir}/systemd-detect-virt | grep -iq VMware && \
%{_bindir}/vmware-checkvm &> /dev/null; then %{_bindir}/vmware-checkvm &> /dev/null; then
# Tell VMware that open-vm-tools is being uninstalled # Tell VMware that open-vm-tools is being uninstalled
@ -293,6 +297,9 @@ fi
%{_libdir}/libvmtools.so %{_libdir}/libvmtools.so
%changelog %changelog
* Mon Jun 20 2016 Ravindra Kumar <ravindrakumar@vmware.com> - 10.0.5-3
- Use systemd-detect-virt to detect VMware platform (RHBZ#1251656).
* Wed May 25 2016 Ravindra Kumar <ravindrakumar@vmware.com> - 10.0.5-2 * Wed May 25 2016 Ravindra Kumar <ravindrakumar@vmware.com> - 10.0.5-2
- Obsolete open-vm-tools-deploypkg because its not needed for v10.x. - Obsolete open-vm-tools-deploypkg because its not needed for v10.x.