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 202c4bbdb4693ceb33ba1706d9ad38d5c7beb4a9..187d2a12644a6cc2ccb828ae813abc29e6675b7f 100644 (file)
--- 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 8fea80a69052e0fae1cfff12ccde3cf48fa9a4c8..22b8fdf5f7aaa3e42c2ca26e048d201184722ef5 100644 (file)
--- 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