Accepting request 879216 from home:lnussel:usrmove

- prepare usrmerge (boo#1029961)

OBS-URL: https://build.opensuse.org/request/show/879216
OBS-URL: https://build.opensuse.org/package/show/Virtualization:VMware/open-vm-tools?expand=0&rev=410
This commit is contained in:
Dominique Leuenberger 2021-03-21 08:32:05 +00:00 committed by Git OBS Bridge
parent 6bf86a4392
commit 6f4ce05a0e
2 changed files with 11 additions and 1 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Mar 15 13:14:28 UTC 2021 - Ludwig Nussel <lnussel@suse.de>
- prepare usrmerge (boo#1029961)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jan 21 23:11:19 UTC 2021 - Kirk Allan <kallan@suse.com> Thu Jan 21 23:11:19 UTC 2021 - Kirk Allan <kallan@suse.com>

View File

@ -311,7 +311,10 @@ install -D -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/modprobe.d/50-vmnics.co
%endif %endif
# fix a link pointing to the buildroot for mount.vmhgfs # fix a link pointing to the buildroot for mount.vmhgfs
( cd %{buildroot}/sbin; rm mount.vmhgfs; ln -s ..%{_sbindir}/mount.vmhgfs ) rm %{buildroot}/sbin/mount.vmhgfs
%if !0%{?usrmerged}
ln -s ..%{_sbindir}/mount.vmhgfs %{buildroot}/sbin/mount.vmhgfs
%endif
%pre %pre
%service_add_pre vmtoolsd.service %service_add_pre vmtoolsd.service
@ -416,7 +419,9 @@ rm -rf %{buildroot}
%{_bindir}/vmware-xferlogs %{_bindir}/vmware-xferlogs
%{_bindir}/vm-support %{_bindir}/vm-support
%{_sbindir}/mount.vmhgfs %{_sbindir}/mount.vmhgfs
%if !0%{?usrmerged}
/sbin/mount.vmhgfs /sbin/mount.vmhgfs
%endif
%config(noreplace) %{_sysconfdir}/pam.d/vmtoolsd %config(noreplace) %{_sysconfdir}/pam.d/vmtoolsd
%dir %{_sysconfdir}/vmware-tools %dir %{_sysconfdir}/vmware-tools
%dir %{_sysconfdir}/vmware-tools/scripts %dir %{_sysconfdir}/vmware-tools/scripts