From: John Wolfe <jwolfe@vmware.com>
Date: Fri, 20 Nov 2020 16:37:31 +0000 (-0800)
Subject: Common header file change not applicable to open-vm-tools.
X-Git-Tag: stable-11.3.0~226
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=735b9639a70429a3f0f50bfbd5bdc506999532c3;p=thirdparty%2Fopen-vm-tools.git

Common header file change not applicable to open-vm-tools.
---

diff --git a/open-vm-tools/lib/include/conf.h b/open-vm-tools/lib/include/conf.h
index a8e9e946e..8abf70fd7 100644
--- a/open-vm-tools/lib/include/conf.h
+++ b/open-vm-tools/lib/include/conf.h
@@ -128,14 +128,15 @@
  */
 
 /*
-******************************************************************************
-* BEGIN GuestStore upgrader goodies.
-*/
+ ******************************************************************************
+ * BEGIN GuestStore upgrader goodies.
+ ******************************************************************************
+ */
 
 /**
  * Defines the string used for the GuestStore upgrade config file group.
  */
-#define CONFGROUPNAME_GUESTSTOREUPGRADE "guestStoreUpgrade"
+#define CONFGROUPNAME_GSUPGRADE "guestStoreUpgrade"
 
 /**
  * Defines the value for GuestStore upgrade feature to be enabled or not.
@@ -146,48 +147,62 @@
  * @param string  Set to "off" no tools upgrade from GuestStore.
  *                Set to "manual" tools upgrade from GuestStore manual start.
  *                Set to "immediate" tools upgrade from GuestStore start
- *                automatically checking on the poll-interval frequency.
+ *                autoCONFNAME_GSUPGRADE_RESOURCEmatically checking on the poll-interval frequency.
  *                Set to "powercycle" tools upgrade from GuestStore on system
  *                power on.
  */
-#define CONFNAME_GUESTSTOREUPGRADE_POLICY "policy"
+#define CONFNAME_GSUPGRADE_POLICY "policy"
 
 /**
- * Define a custom GuestStore Upgrade poll interval (in seconds).
+ * Define a custom GuestStore check poll interval (in seconds).
  *
  * @note Illegal values result in a @c g_warning and fallback to the default
  * poll interval.
  *
  * @param int   User-defined poll interval.  Set to 0 to disable polling.
  */
-#define CONFNAME_GUESTSTOREUPGRADE_POLLINTERVAL "poll-interval"
+#define CONFNAME_GSUPGRADE_POLLINTERVAL "poll-interval"
 
 /**
- * Defines the value for GuestStore upgrade to upgrade or not.
+ * Define a custom GuestStore periodic Upgrade interval (in seconds).
  *
  * @note Illegal values result in a @c g_warning and fallback to the default
- * value.
+ * upgrade interval.
  *
- * @param boolean Set to TRUE to disable publishing.
- *                Set to FALSE to enable publishing.
+ * @param int   User-defined upgrade interval.  Set to 0 to disable polling.
  */
-#define CONFNAME_GUESTSTOREUPGRADE_ALLOW_UPGRADE "allow-upgrade"
+#define CONFNAME_GSUPGRADE_UPGRADEINTERVAL "upgrade-interval"
 
 /**
- * Defines the value for GuestStore upgrade to add or remove features or not.
+ * Define a custom GuestStore content path prefix.
  *
  * @note Illegal values result in a @c g_warning and fallback to the default
- * value.
+ * resource path.
  *
- * @param boolean Set to TRUE to disable publishing.
- *                Set to FALSE to enable publishing.
+ * @param string  User-defined GuestStore resource path.
  */
-#define CONFNAME_GUESTSTOREUPGRADE_ALLOW_ADDREMOVE_FEATURE "allow-addremove-feature"
+#define CONFNAME_GSUPGRADE_RESOURCE "resource"
+
+/**
+ * Define a custom GuestStore content vmtools key.
+ *
+ * @note Illegal values result in a @c g_warning and fallback to the default
+ * vmtools key.
+ *
+ * @param string  User-defined GuestStore vmtools key.
+ *                Set to "vmtools" for the latest version.
+ *                Suggested examples for earlier versions are:
+ *                Set to "vmtools-11.0.0" for "vmtools-11.0.0/"
+ *                Set to "vmtools-11.1.0" for "vmtools-11.1.0/"
+ *                Set to "vmtools-11.2.0" for "vmtools-11.2.0/"
+ *                Set to "vmtools-11.3.0" for "vmtools-11.3.0/"
+ */
+#define CONFNAME_GSUPGRADE_VMTOOLS_VERSION "vmtools-version-key"
 
 /*
-* END GuestStore upgrader goodies.
-******************************************************************************
-*/
+ * END GuestStore upgrader goodies.
+ ******************************************************************************
+ */
 
 
 /*