vmtoolsd-init.service is no longer needed for 11.0.0, removed it.

This commit is contained in:
Ravindra Kumar 2019-10-02 20:21:19 -07:00
parent 5d8b42b679
commit 0eea930ece
3 changed files with 8 additions and 28 deletions

View File

@ -28,15 +28,14 @@
Name: open-vm-tools
Version: %{toolsversion}
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Open Virtual Machine Tools for virtual machines hosted on VMware
License: GPLv2
URL: https://github.com/vmware/%{name}
Source0: https://github.com/vmware/%{name}/releases/download/stable-%{version}/%{name}-%{version}-%{toolsbuild}.tar.gz
Source1: %{toolsdaemon}-init.service
Source2: %{toolsdaemon}.service
Source3: %{vgauthdaemon}.service
Source1: %{toolsdaemon}.service
Source2: %{vgauthdaemon}.service
%if 0%{?rhel} >= 7
ExclusiveArch: x86_64
@ -202,9 +201,8 @@ rm -fr %{buildroot}%{_sbindir} %{buildroot}/sbin/mount.vmhgfs
mv %{buildroot}%{_sysconfdir}/vmware-tools/vm-support %{buildroot}%{_bindir}
# Systemd unit files
install -p -m 644 -D %{SOURCE1} %{buildroot}%{_unitdir}/%{toolsdaemon}-init.service
install -p -m 644 -D %{SOURCE2} %{buildroot}%{_unitdir}/%{toolsdaemon}.service
install -p -m 644 -D %{SOURCE3} %{buildroot}%{_unitdir}/%{vgauthdaemon}.service
install -p -m 644 -D %{SOURCE1} %{buildroot}%{_unitdir}/%{toolsdaemon}.service
install -p -m 644 -D %{SOURCE2} %{buildroot}%{_unitdir}/%{vgauthdaemon}.service
# '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
@ -224,12 +222,10 @@ if [ -f %{_bindir}/vmware-checkvm -a \
mkdir -p /mnt/hgfs
fi
%systemd_post %{toolsdaemon}-init.service
%systemd_post %{vgauthdaemon}.service
%systemd_post %{toolsdaemon}.service
%preun
%systemd_preun %{toolsdaemon}-init.service
%systemd_preun %{toolsdaemon}.service
%systemd_preun %{vgauthdaemon}.service
@ -253,7 +249,6 @@ fi
%postun
%{?ldconfig}
%systemd_postun_with_restart %{toolsdaemon}-init.service
%systemd_postun_with_restart %{toolsdaemon}.service
%systemd_postun_with_restart %{vgauthdaemon}.service
@ -296,7 +291,6 @@ fi
%{_libdir}/%{name}/plugins/vmsvc/*.so
%{_datadir}/%{name}/
%{_udevrulesdir}/99-vmware-scsi-udev.rules
%{_unitdir}/%{toolsdaemon}-init.service
%{_unitdir}/%{toolsdaemon}.service
%{_unitdir}/%{vgauthdaemon}.service
@ -322,6 +316,9 @@ fi
%{_bindir}/vmware-vgauth-smoketest
%changelog
* Wed Oct 02 2019 Ravindra Kumar <ravindrakumar@vmware.com> - 11.0.0-2
- vmtoolsd-init.service is no longer needed for 11.0.0, removed it.
* Wed Oct 02 2019 Ravindra Kumar <ravindrakumar@vmware.com> - 11.0.0-1
- Package new upstream version open-vm-tools-11.0.0-14549434.
- Added gcc9-static-inline.patch for gcc9 warnings.

View File

@ -1,14 +0,0 @@
[Unit]
Description=One-time configuration for vmtoolsd
ConditionVirtualization=vmware
ConditionPathExists=|!/etc/vmware-tools/GuestProxyData/server/cert.pem
ConditionPathExists=|!/etc/vmware-tools/GuestProxyData/server/key.pem
PartOf=vmtoolsd.service
[Service]
Type=oneshot
RemainAfterExit=no
ExecStart=/usr/bin/vmware-guestproxycerttool -g
[Install]
RequiredBy=vmtoolsd.service

View File

@ -2,9 +2,7 @@
Description=Service for virtual machines hosted on VMware
Documentation=http://github.com/vmware/open-vm-tools
ConditionVirtualization=vmware
Requires=vmtoolsd-init.service
Requires=vgauthd.service
After=vmtoolsd-init.service
After=vgauthd.service
[Service]
@ -13,5 +11,4 @@ TimeoutStopSec=5
[Install]
WantedBy=multi-user.target
Also=vmtoolsd-init.service
Also=vgauthd.service