From 75eb4764415485104cf03dd9d9daa60c0a546615 Mon Sep 17 00:00:00 2001
From: Ravindra Kumar <ravindrakumar@vmware.com>
Date: Wed, 9 Oct 2019 18:50:53 -0700
Subject: [PATCH] Fixes for drag-n-drop that needs vmblock-fuse mount. Added
 run-vmblock\x2dfuse.mount service unit for vmblock-fuse mount. Added
 open-vm-tools.conf for loading Fuse.

---
 open-vm-tools.conf           |  1 +
 open-vm-tools.spec           | 22 +++++++++++++++++++++-
 "run-vmblock\\x2dfuse.mount" | 17 +++++++++++++++++
 3 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 open-vm-tools.conf
 create mode 100644 "run-vmblock\\x2dfuse.mount"

diff --git a/open-vm-tools.conf b/open-vm-tools.conf
new file mode 100644
index 0000000..a517c48
--- /dev/null
+++ b/open-vm-tools.conf
@@ -0,0 +1 @@
+fuse
diff --git a/open-vm-tools.spec b/open-vm-tools.spec
index fa48194..ecda8b7 100644
--- a/open-vm-tools.spec
+++ b/open-vm-tools.spec
@@ -36,6 +36,8 @@ URL:              https://github.com/vmware/%{name}
 Source0:          https://github.com/vmware/%{name}/releases/download/stable-%{version}/%{name}-%{version}-%{toolsbuild}.tar.gz
 Source1:          %{toolsdaemon}.service
 Source2:          %{vgauthdaemon}.service
+Source3:          run-vmblock\x2dfuse.mount
+Source4:          open-vm-tools.conf
 
 %if 0%{?rhel} >= 7
 ExclusiveArch:    x86_64
@@ -203,6 +205,8 @@ mv %{buildroot}%{_sysconfdir}/vmware-tools/vm-support %{buildroot}%{_bindir}
 # Systemd unit files
 install -p -m 644 -D %{SOURCE1} %{buildroot}%{_unitdir}/%{toolsdaemon}.service
 install -p -m 644 -D %{SOURCE2} %{buildroot}%{_unitdir}/%{vgauthdaemon}.service
+install -p -m 644 -D '%{SOURCE3}' %{buildroot}%{_unitdir}/run-vmblock\\x2dfuse.mount
+install -p -m 644 -D %{SOURCE4} %{buildroot}%{_modulesloaddir}/open-vm-tools.conf
 
 # 'make check' in open-vm-tools rebuilds docs and ends up regenerating
 # the font file. We can add %%check secion once 'make check' is fixed
@@ -237,6 +241,9 @@ fi
 %systemd_post %{vgauthdaemon}.service
 %systemd_post %{toolsdaemon}.service
 
+%post desktop
+%systemd_post run-vmblock\x2dfuse.mount
+
 %preun
 %systemd_preun %{toolsdaemon}.service
 %systemd_preun %{vgauthdaemon}.service
@@ -259,11 +266,17 @@ if [ "$1" = "0" -a                                       \
    fi
 fi
 
+%preun desktop
+%systemd_preun run-vmblock\x2dfuse.mount
+
 %postun
 %{?ldconfig}
 %systemd_postun_with_restart %{toolsdaemon}.service
 %systemd_postun_with_restart %{vgauthdaemon}.service
 
+%postun desktop
+%systemd_postun run-vmblock\x2dfuse.mount
+
 %files
 %license COPYING
 %doc AUTHORS ChangeLog NEWS README
@@ -305,11 +318,13 @@ fi
 %{_udevrulesdir}/99-vmware-scsi-udev.rules
 %{_unitdir}/%{toolsdaemon}.service
 %{_unitdir}/%{vgauthdaemon}.service
+%{_unitdir}/run-vmblock\x2dfuse.mount
+%{_modulesloaddir}/open-vm-tools.conf
 
 %files desktop
 %{_sysconfdir}/xdg/autostart/*.desktop
 %{_bindir}/vmware-user
-%{_bindir}/vmware-user-suid-wrapper
+%attr(4755,-,-) %{_bindir}/vmware-user-suid-wrapper
 %{_bindir}/vmware-vmblock-fuse
 %{_libdir}/%{name}/plugins/vmusr/
 
@@ -328,6 +343,11 @@ fi
 %{_bindir}/vmware-vgauth-smoketest
 
 %changelog
+* Wed Oct 09 2019 Ravindra Kumar <ravindrakumar@vmware.com> - 11.0.0-4
+- Fixes for drag-n-drop that needs vmblock-fuse mount.
+- Added run-vmblock\x2dfuse.mount service unit for vmblock-fuse mount.
+- Added open-vm-tools.conf for loading Fuse.
+
 * Wed Oct 09 2019 Ravindra Kumar <ravindrakumar@vmware.com> - 11.0.0-3
 - Cleanup GuestProxy certs from /etc/vmware-tools/GuestProxyData if needed.
 - Cleanup vmtoolsd-init service symlinks.
diff --git "a/run-vmblock\\x2dfuse.mount" "b/run-vmblock\\x2dfuse.mount"
new file mode 100644
index 0000000..d7be7c2
--- /dev/null
+++ "b/run-vmblock\\x2dfuse.mount"
@@ -0,0 +1,17 @@
+[Unit]
+Description=VMware vmblock Fuse Mount
+Documentation=https://github.com/vmware/open-vm-tools/blob/master/open-vm-tools/vmblock-fuse/design.txt
+DefaultDependencies=no
+Before=umount.target vmtoolsd.service
+ConditionVirtualization=vmware
+After=sys-fs-fuse-connections.mount
+Wants=vmtoolsd.service
+
+[Mount]
+What=vmware-vmblock-fuse
+Where=/run/vmblock-fuse
+Type=fuse
+Options=subtype=vmware-vmblock,default_permissions,allow_other
+
+[Install]
+WantedBy=multi-user.target