forked from rpms/open-vm-tools
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.
This commit is contained in:
parent
0635f2f8cd
commit
75eb476441
1
open-vm-tools.conf
Normal file
1
open-vm-tools.conf
Normal file
@ -0,0 +1 @@
|
|||||||
|
fuse
|
@ -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
|
Source0: https://github.com/vmware/%{name}/releases/download/stable-%{version}/%{name}-%{version}-%{toolsbuild}.tar.gz
|
||||||
Source1: %{toolsdaemon}.service
|
Source1: %{toolsdaemon}.service
|
||||||
Source2: %{vgauthdaemon}.service
|
Source2: %{vgauthdaemon}.service
|
||||||
|
Source3: run-vmblock\x2dfuse.mount
|
||||||
|
Source4: open-vm-tools.conf
|
||||||
|
|
||||||
%if 0%{?rhel} >= 7
|
%if 0%{?rhel} >= 7
|
||||||
ExclusiveArch: x86_64
|
ExclusiveArch: x86_64
|
||||||
@ -203,6 +205,8 @@ mv %{buildroot}%{_sysconfdir}/vmware-tools/vm-support %{buildroot}%{_bindir}
|
|||||||
# Systemd unit files
|
# Systemd unit files
|
||||||
install -p -m 644 -D %{SOURCE1} %{buildroot}%{_unitdir}/%{toolsdaemon}.service
|
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 %{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
|
# '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
|
# the font file. We can add %%check secion once 'make check' is fixed
|
||||||
@ -237,6 +241,9 @@ fi
|
|||||||
%systemd_post %{vgauthdaemon}.service
|
%systemd_post %{vgauthdaemon}.service
|
||||||
%systemd_post %{toolsdaemon}.service
|
%systemd_post %{toolsdaemon}.service
|
||||||
|
|
||||||
|
%post desktop
|
||||||
|
%systemd_post run-vmblock\x2dfuse.mount
|
||||||
|
|
||||||
%preun
|
%preun
|
||||||
%systemd_preun %{toolsdaemon}.service
|
%systemd_preun %{toolsdaemon}.service
|
||||||
%systemd_preun %{vgauthdaemon}.service
|
%systemd_preun %{vgauthdaemon}.service
|
||||||
@ -259,11 +266,17 @@ if [ "$1" = "0" -a \
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
%preun desktop
|
||||||
|
%systemd_preun run-vmblock\x2dfuse.mount
|
||||||
|
|
||||||
%postun
|
%postun
|
||||||
%{?ldconfig}
|
%{?ldconfig}
|
||||||
%systemd_postun_with_restart %{toolsdaemon}.service
|
%systemd_postun_with_restart %{toolsdaemon}.service
|
||||||
%systemd_postun_with_restart %{vgauthdaemon}.service
|
%systemd_postun_with_restart %{vgauthdaemon}.service
|
||||||
|
|
||||||
|
%postun desktop
|
||||||
|
%systemd_postun run-vmblock\x2dfuse.mount
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%license COPYING
|
%license COPYING
|
||||||
%doc AUTHORS ChangeLog NEWS README
|
%doc AUTHORS ChangeLog NEWS README
|
||||||
@ -305,11 +318,13 @@ fi
|
|||||||
%{_udevrulesdir}/99-vmware-scsi-udev.rules
|
%{_udevrulesdir}/99-vmware-scsi-udev.rules
|
||||||
%{_unitdir}/%{toolsdaemon}.service
|
%{_unitdir}/%{toolsdaemon}.service
|
||||||
%{_unitdir}/%{vgauthdaemon}.service
|
%{_unitdir}/%{vgauthdaemon}.service
|
||||||
|
%{_unitdir}/run-vmblock\x2dfuse.mount
|
||||||
|
%{_modulesloaddir}/open-vm-tools.conf
|
||||||
|
|
||||||
%files desktop
|
%files desktop
|
||||||
%{_sysconfdir}/xdg/autostart/*.desktop
|
%{_sysconfdir}/xdg/autostart/*.desktop
|
||||||
%{_bindir}/vmware-user
|
%{_bindir}/vmware-user
|
||||||
%{_bindir}/vmware-user-suid-wrapper
|
%attr(4755,-,-) %{_bindir}/vmware-user-suid-wrapper
|
||||||
%{_bindir}/vmware-vmblock-fuse
|
%{_bindir}/vmware-vmblock-fuse
|
||||||
%{_libdir}/%{name}/plugins/vmusr/
|
%{_libdir}/%{name}/plugins/vmusr/
|
||||||
|
|
||||||
@ -328,6 +343,11 @@ fi
|
|||||||
%{_bindir}/vmware-vgauth-smoketest
|
%{_bindir}/vmware-vgauth-smoketest
|
||||||
|
|
||||||
%changelog
|
%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
|
* Wed Oct 09 2019 Ravindra Kumar <ravindrakumar@vmware.com> - 11.0.0-3
|
||||||
- Cleanup GuestProxy certs from /etc/vmware-tools/GuestProxyData if needed.
|
- Cleanup GuestProxy certs from /etc/vmware-tools/GuestProxyData if needed.
|
||||||
- Cleanup vmtoolsd-init service symlinks.
|
- Cleanup vmtoolsd-init service symlinks.
|
||||||
|
17
run-vmblock\x2dfuse.mount
Normal file
17
run-vmblock\x2dfuse.mount
Normal file
@ -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
|
Loading…
Reference in New Issue
Block a user