From: Oliver Kurth <okurth@vmware.com>
Date: Thu, 3 Oct 2019 00:48:34 +0000 (-0700)
Subject: Move /etc/vmware-tools/vm-support to /usr/bin/ in open-vm-tools.
X-Git-Tag: stable-11.1.0~214
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00d44381a374d60245f286a3faaf66663be678a8;p=thirdparty%2Fopen-vm-tools.git

Move /etc/vmware-tools/vm-support to /usr/bin/ in open-vm-tools.

Change scripts/Makefile.am to know about the new location.

This fix requires the following updates to the vendor scripts:
The rules files have "chmod /etc/vmware-tools/vm-support".
The spec files have "mv /etc/vmware-tools/vm-support /usr/bin".
---

diff --git a/open-vm-tools/scripts/Makefile.am b/open-vm-tools/scripts/Makefile.am
index 5ab2f249d..55c218bd2 100644
--- a/open-vm-tools/scripts/Makefile.am
+++ b/open-vm-tools/scripts/Makefile.am
@@ -22,10 +22,13 @@ defaultscripts += resume-vm-default
 
 confdir = /etc/vmware-tools
 
-conf_SCRIPTS = ./common/vm-support
-conf_SCRIPTS += ./common/statechange.subr
+conf_SCRIPTS = ./common/statechange.subr
 conf_SCRIPTS += $(defaultscripts)
 
+vmsupportdir = /usr/bin
+
+vmsupport_SCRIPTS = ./common/vm-support
+
 vmwsrcdir = $(confdir)/scripts/vmware
 
 vmwsrc_SCRIPTS = $(MODULES_OS)/network