diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2008-08-03 14:39:11 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2008-08-03 14:39:11 +0000 |
| commit | c6862347155f6492036a93f95e6db25560e5e241 (patch) | |
| tree | fe2f637154af89d518601801d62241fe0838c92b /emulators/open-vm-tools | |
| parent | - Update to 1.0 (diff) | |
vmware-guestd has been installed twice. Fix pkg-plist for this issue.
Submitted by: Olli Hauer <ohauer@gmx.de>
PR: 126210
Notes
Notes:
svn path=/head/; revision=217994
Diffstat (limited to 'emulators/open-vm-tools')
| -rw-r--r-- | emulators/open-vm-tools/Makefile | 1 | ||||
| -rw-r--r-- | emulators/open-vm-tools/files/vmware-guestd.sh.in | 2 | ||||
| -rw-r--r-- | emulators/open-vm-tools/pkg-plist | 2 | ||||
| -rw-r--r-- | emulators/open-vm-tools/pkg-plist-x11 | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile index 4433530b83d7..f4d41bae203b 100644 --- a/emulators/open-vm-tools/Makefile +++ b/emulators/open-vm-tools/Makefile @@ -69,7 +69,6 @@ post-install: ${MKDIR} -p ${PREFIX}/lib/vmware-tools/modules/drivers ${MKDIR} -p ${PREFIX}/lib/vmware-tools/modules/input ${MKDIR} -p ${PREFIX}/share/vmware-tools - ${INSTALL} ${WRKSRC}/guestd/vmware-guestd ${PREFIX}/bin/vmware-guestd .if ${OSREL} >= 6 ${INSTALL} ${WRKSRC}/hgfsmounter/mount.vmhgfs ${PREFIX}/sbin/mount_vmhgfs .endif diff --git a/emulators/open-vm-tools/files/vmware-guestd.sh.in b/emulators/open-vm-tools/files/vmware-guestd.sh.in index d103d830263c..9a95a5e3f0be 100644 --- a/emulators/open-vm-tools/files/vmware-guestd.sh.in +++ b/emulators/open-vm-tools/files/vmware-guestd.sh.in @@ -11,7 +11,7 @@ PREFIX=%%PREFIX%% . %%RC_SUBR%% # Global -checkvm_cmd="${PREFIX}/sbin/vmware-checkvm > /dev/null" +checkvm_cmd="${PREFIX}/bin/vmware-checkvm > /dev/null" # VMware guest daemon name="vmware_guestd" diff --git a/emulators/open-vm-tools/pkg-plist b/emulators/open-vm-tools/pkg-plist index e001f9d30b53..fcf74f82cfa6 100644 --- a/emulators/open-vm-tools/pkg-plist +++ b/emulators/open-vm-tools/pkg-plist @@ -12,10 +12,10 @@ share/vmware-tools/poweron-vm-default share/vmware-tools/resume-vm-default share/vmware-tools/suspend-vm-default share/vmware-tools/vm-support -bin/vmware-guestd bin/vmware-checkvm bin/vmware-xferlogs bin/vmware-hgfsclient +sbin/vmware-guestd etc/vmware-tools/tools.conf %%FIVEONLY%%sbin/mount_vmhgfs @unexec if test -f %D/lib/vmware-tools/modules/drivers/linker.hints; then rm -f %D/lib/vmware-tools/modules/drivers/linker.hints; fi diff --git a/emulators/open-vm-tools/pkg-plist-x11 b/emulators/open-vm-tools/pkg-plist-x11 index 26afadd398f3..559801d3ff0b 100644 --- a/emulators/open-vm-tools/pkg-plist-x11 +++ b/emulators/open-vm-tools/pkg-plist-x11 @@ -13,12 +13,12 @@ share/vmware-tools/resume-vm-default share/vmware-tools/suspend-vm-default share/vmware-tools/vm-support share/pixmaps/vmware/vmware-toolbox.xpm -bin/vmware-guestd bin/vmware-toolbox bin/vmware-user bin/vmware-checkvm bin/vmware-xferlogs bin/vmware-hgfsclient +sbin/vmware-guestd etc/vmware-tools/tools.conf %%FIVEONLY%%sbin/mount_vmhgfs %%X11%%sbin/vmware-toolbox |