From: John Wolfe <jwolfe@vmware.com>
Date: Fri, 11 Sep 2020 19:11:06 +0000 (-0700)
Subject: Common source file changes not applicable to open-vm-tools.
X-Git-Tag: stable-11.2.0~10
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=19d12e9a038a1835155ae26631b9a34d5a54cfcd;p=thirdparty%2Fopen-vm-tools.git

Common source file changes 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 5137203cd..8c9c636f2 100644
--- a/open-vm-tools/lib/include/conf.h
+++ b/open-vm-tools/lib/include/conf.h
@@ -137,25 +137,29 @@
 #define CONFGROUPNAME_GUESTSTOREUPGRADE "guestStoreUpgrade"
 
 /**
- * Define a custom GuestStore Upgrade poll interval (in seconds).
+ * Defines the value for GuestStore upgrade feature to be enabled or not.
  *
  * @note Illegal values result in a @c g_warning and fallback to the default
- * poll interval.
+ * value.
  *
- * @param int   User-defined poll interval.  Set to 0 to disable polling.
+ * @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.
+ *                Set to "powercycle" tools upgrade from GuestStore on system
+ *                power on.
  */
-#define CONFNAME_GUESTSTOREUPGRADE_POLLINTERVAL "poll-interval"
+#define CONFNAME_GUESTSTOREUPGRADE_POLICY "policy"
 
 /**
- * Defines the value for GuestStore upgrade feature to be enabled or not.
+ * Define a custom GuestStore Upgrade poll interval (in seconds).
  *
  * @note Illegal values result in a @c g_warning and fallback to the default
- * value.
+ * poll interval.
  *
- * @param boolean Set to TRUE to disable publishing.
- *                Set to FALSE to enable publishing.
+ * @param int   User-defined poll interval.  Set to 0 to disable polling.
  */
-#define CONFNAME_GUESTSTOREUPGRADE_DISABLED "disabled"
+#define CONFNAME_GUESTSTOREUPGRADE_POLLINTERVAL "poll-interval"
 
 /**
  * Defines the value for GuestStore upgrade to upgrade or not.
diff --git a/open-vm-tools/lib/include/vmware/guestrpc/capabilities.h b/open-vm-tools/lib/include/vmware/guestrpc/capabilities.h
index 354a2b753..11d35eeed 100644
--- a/open-vm-tools/lib/include/vmware/guestrpc/capabilities.h
+++ b/open-vm-tools/lib/include/vmware/guestrpc/capabilities.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2008-2017 VMware, Inc. All rights reserved.
+ * Copyright (C) 2008-2017,2020 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -76,6 +76,7 @@ typedef enum {
    GHI_CAP_SET_DISPLAY_SCALING          = 31, // supports setting the display scaling (DPI)
    UNITY_CAP_DISABLE_MOUSE_BUTTON_SWAPPING     = 32, // supports disabling mouse button swapping
    UNITY_CAP_CARET_POSITION             = 33, // supports sending caret position updates
+   CAP_GUESTSTORE_UPGRADE               = 34, // supports tools upgrade from GuestStore
 } GuestCapabilities;
 
 typedef struct {