From: John Wolfe <jwolfe@vmware.com>
Date: Fri, 7 Aug 2020 19:03:25 +0000 (-0700)
Subject: Common source file changes not directly applicable to open-vm-tools.
X-Git-Tag: stable-11.2.0~86
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1eb8a82ac5e2f493ad23caf67e9bab8fd4cd3802;p=thirdparty%2Fopen-vm-tools.git

Common source file changes not directly applicable to open-vm-tools.
---

diff --git a/open-vm-tools/lib/include/conf.h b/open-vm-tools/lib/include/conf.h
index 202c4bbdb..187d2a126 100644
--- a/open-vm-tools/lib/include/conf.h
+++ b/open-vm-tools/lib/include/conf.h
@@ -510,6 +510,11 @@
  */
 #define CONFNAME_CBHELPER_POLLINTERVAL "poll-interval"
 
+/**
+ * Defines user-defined retry counter to execute cblauncher.exe on failure.
+ */
+#define CONFNAME_CBHELPER_CBLAUNCHER_RETRY_COUNT "cblauncher-retry-count"
+
 /*
  ******************************************************************************
  * END CarbonBlack helper plugin goodies.
diff --git a/open-vm-tools/tools.conf b/open-vm-tools/tools.conf
index 8fea80a69..22b8fdf5f 100644
--- a/open-vm-tools/tools.conf
+++ b/open-vm-tools/tools.conf
@@ -322,3 +322,7 @@
 
 # User-defined poll interval in seconds. Set to 0 to disable polling.
 #poll-interval=60
+
+# User-defined retry count to execute cblauncher.exe
+# Default to 3 and should be greater than 3.
+#cblauncher-retry-count=3