Merge ~bryce/ubuntu/+source/open-vm-tools:mre-lp1998558-kinetic into ubuntu/+source/open-vm-tools:ubuntu/kinetic-devel

[Bryce Harrington]

This is the MRE for this cycle's update to open-vm-tools.

PPA: https://launchpad.net/~bryce/+archive/ubuntu/open-vm-tools-mre-lp1998558

Autopkgtests are running...
$ ppa tests https://launchpad.net/~bryce/+archive/ubuntu/open-vm-tools-mre-lp1998558

This is pretty straightforward, there was one modification I added to fix a build issues due to missing build-dep libabsl-dev.

I considered rolling in the fix for LP: #1999945, but that's just a cosmetic typo that doesn't seem to cause any problems and wouldn't be accepted as SRU, so I've left it and will tend to it in the next merge.

I verified the package builds and installs/uninstalls in LXC. The service doesn't run in LXC but I assume it'd need a full VM or better since it's a virtualization system itself.

[Andreas Hasenack (ahasenack)]

+1, the jammy MP[1] has more comments, but this is essentially the same.

1. https://code.launchpad.net/~bryce/ubuntu/+source/open-vm-tools/+git/open-vm-tools/+merge/441525

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: bryce, ahasenack
Uploaders: bryce, ahasenack
MP auto-approved

review: Approve

[Bryce Harrington (bryce)]

Thanks for the review. Added the bug ref as discussed in the other MP, and uploaded:

Successfully signed dsc, buildinfo, changes files
Vcs-Git: https://git.launchpad.net/~bryce/ubuntu/+source/open-vm-tools
Vcs-Git-Commit: d6f357cdb92f5b97c3ed5c5228977b2fdf840e62
Vcs-Git-Ref: refs/heads/mre-lp1998558-kinetic
$ dput ubuntu ../open-vm-tools_12.1.5-3~ubuntu0.22.10.1_source.changes
gpg: ../open-vm-tools_12.1.5-3~ubuntu0.22.10.1_source.changes: Valid signature from E603B2578FB8F0FB
gpg: ../open-vm-tools_12.1.5-3~ubuntu0.22.10.1.dsc: Valid signature from E603B2578FB8F0FB
D: Setting host argument.
Checking signature on .changes
Checking signature on .dsc
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading open-vm-tools_12.1.5-3~ubuntu0.22.10.1.dsc: done.
  Uploading open-vm-tools_12.1.5-3~ubuntu0.22.10.1.debian.tar.xz: done.
  Uploading open-vm-tools_12.1.5-3~ubuntu0.22.10.1_source.buildinfo: done.
  Uploading open-vm-tools_12.1.5-3~ubuntu0.22.10.1_source.changes: done.
Successfully uploaded packages.

diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index ca8f6a8..bdb0c7d 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -1,8 +1,8 @@
-#                      Open-vm-tools 12.1.0 Release Notes
+#                      open-vm-tools 12.1.5 Release Notes
 
-Updated on: 23rd AUG 2022
+Updated on: 29th NOV 2022
 
-Open-vm-tools | 23rd AUG 2022 | Build 20219665
+open-vm-tools | 29th NOV 2022 | Build 20735119
 
 Check back for additions and updates to these release notes.
 
@@ -20,14 +20,17 @@ The release notes cover the following topics:
 
 ## <a id="whatsnew" name="whatsnew"></a>What's New
 
-* This release resolves CVE-2022-31676. For more information on this vulnerability and its impact on VMware products, see [https://www.vmware.com/security/advisories/VMSA-2022-0024.html](https://www.vmware.com/security/advisories/VMSA-2022-0024.html).
+There are no new features in the open-vm-tools 12.1.5 release.  This is primarily a maintenance release that addresses a few critical problems.
 
 *   Please see the [Resolved Issues](#resolvedissues) and [Known Issues](#knownissues) sections below.
 
+*   A complete list of the granular changes in the open-vm-tools 12.1.5 release is available at:
+
+    [open-vm-tools ChangeLog](https://github.com/vmware/open-vm-tools/blob/stable-12.1.5/open-vm-tools/ChangeLog)
 
 ## <a id="i18n" name="i18n"></a>Internationalization
 
-Open-vm-tools 12.1.0 is available in the following languages:
+open-vm-tools 12.1.5 is available in the following languages:
 
 * English
 * French
@@ -39,34 +42,29 @@ Open-vm-tools 12.1.0 is available in the following languages:
 * Simplified Chinese
 * Traditional Chinese
 
-## <a id="endoffeaturesupport" name="endoffeaturesupport"></a>End of Feature Support Notice
-
- * The tar tools (linux.iso) and OSPs shipped with VMware Tools 10.3.x release will continue to be supported. However, releases after VMware Tools 10.3.5 will only include critical and security fixes. No new feature support will be provided in these types of VMware Tools (tar tools and OSP's). It is recommended that customers use open-vm-tools for those operating systems that support open-vm-tools. For more information about open-vm-tools, see [KB 2073803](https://kb.vmware.com/s/article/2073803).
-
-## <a id="guestop" name="guestop"></a>Guest Operating System Customization Support
-The [Guest OS Customization Support Matrix](http://partnerweb.vmware.com/programs/guestOS/guest-os-customization-matrix.pdf) provides details about the guest operating systems supported for customization.
-
 ## <a id="interop" name="interop"></a>Interoperability Matrix
 
 The [VMware Product Interoperability Matrix](http://partnerweb.vmware.com/comp_guide2/sim/interop_matrix.php) provides details about the compatibility of current and earlier versions of VMware Products. 
 
 ## <a id="resolvedissues" name ="resolvedissues"></a> Resolved Issues
 
-*   A number of Coverity reported issues have been addressed.
+*   **A number of Coverity reported issues have been addressed.**
 
-*   **[FTBFS] Fix the build of the ContainerInfo plugin for a 32-bit Linux release**
+*   **The deployPkg plugin may prematurely reboot the guest VM before cloud-init has completed user data setup.**
 
-    Reported in [open-vm-tools pull request #588](https://github.com/vmware/open-vm-tools/pull/588), the fix did not make the code freeze date for open-vm-tools 12.0.5.
+    If both the Perl based Linux customization script and cloud-init run when the guest VM boots, the deployPkg plugin may reboot the guest before cloud-init has finished.  The deployPkg plugin has been updated to wait for a running cloud-init process to finish before the guest VM reboot is initiated.
 
     This issue is fixed in this release.
 
-*   **Make HgfsConvertFromNtTimeNsec aware of 64-bit time_t on i386 (32-bit)**
+*   **A SIGSEGV may be encountered when a non-quiesing snapshot times out.**
+
+    This issue is fixed in this release.
 
-    Reported in [open-vm-tools pull request #387](https://github.com/vmware/open-vm-tools/pull/387), this change incorporates the support of 64 bit time epoch conversion from Windows NT time to Unix Epoch time on i386.
+*   **Unwanted vmtoolsd service error message if not on a VMware hypervisor.**
 
-*   **A complete list of the granular changes in the open-vm-tools 12.1.0 release is available at:**
+    When open-vm-tools comes preinstalled in a base Linux release, the vmtoolsd services are started automatically at system start and desktop login.  If running on physical hardware or in a non-VMware hypervisor, the services will emit an error message to the Systemd's logging service before stopping.
 
-    [Open-vm-tools ChangeLog](https://github.com/vmware/open-vm-tools/blob/stable-12.1.0/open-vm-tools/ChangeLog)
+    This issue is fixed in this release.
 
 ## <a id="knownissues" name="knownissues"></a>Known Issues
 
@@ -83,6 +81,3 @@ The [VMware Product Interoperability Matrix](http://partnerweb.vmware.com/comp_
 
     <tt>vmhgfs-fuse   /mnt/hgfs    fuse    defaults,allow_other    0    0</tt>
 
-
-
-
diff --git a/debian/changelog b/debian/changelog
index c785341..4133f05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,46 @@
+open-vm-tools (2:12.1.5-3~ubuntu0.22.10.1) kinetic; urgency=medium
+
+  * Backport recent open-vm-tools release v12.1.5
+    (LP: #1998558)
+  * d/control: Add libabsl-dev as explicit build-dependency.
+    - (Closes #1032305)
+
+ -- Bryce Harrington <[e-mail]>  Thu, 16 Mar 2023 23:55:51 +0000
+
+open-vm-tools (2:12.1.5-3) unstable; urgency=medium
+
+  * [1e4d8a9] Remove libprocps-dev build-dep. (Closes: #1027271)
+
+ -- Bernd Zeimetz <[e-mail]>  Tue, 03 Jan 2023 12:19:05 +0100
+
+open-vm-tools (2:12.1.5-2) unstable; urgency=medium
+
+  * [f450cf8] Fix building with gRPC 1.51+
+    Thanks to Laszlo Boszormenyi (GCS) (Closes: #1025491)
+
+ -- Bernd Zeimetz <[e-mail]>  Sat, 24 Dec 2022 16:52:48 +0100
+
+open-vm-tools (2:12.1.5-1) unstable; urgency=medium
+
+  * [d4a64a2] New upstream version 12.1.5
+  * [adcd7a9] Remove accidentally added patch backup files
+
+ -- Bernd Zeimetz <[e-mail]>  Wed, 07 Dec 2022 17:30:35 +0100
+
+open-vm-tools (2:12.1.0-2) unstable; urgency=medium
+
+  [ Debian Janitor ]
+  * [2d8b9bb] Update lintian override info to new format on line 2.
+    Changes-By: lintian-brush
+    Fixes: lintian: mismatched-override
+    See-also: https://lintian.debian.org/tags/mismatched-override.html
+
+  [ Bernd Zeimetz ]
+  * [fa63406] Move libguestStore.so, libgdp.so to open-vm-tools
+    (Closes: #1021611) (LP: #1992501)
+
+ -- Bernd Zeimetz <[e-mail]>  Mon, 14 Nov 2022 16:19:10 +0100
+
 open-vm-tools (2:12.1.0-1) unstable; urgency=high
 
   * [e704b2c] New upstream version 12.1.0
diff --git a/debian/control b/debian/control
index a500ad2..6229403 100644
--- a/debian/control
+++ b/debian/control
@@ -1,12 +1,13 @@
 Source: open-vm-tools
 Section: admin
 Priority: optional
-Maintainer: Bernd Zeimetz <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Bernd Zeimetz <[e-mail]>
 Uploaders: Christian Ehrhardt <[e-mail]>
 Build-Depends:
  debhelper-compat (= 13), doxygen, libcunit1-dev,
  libfuse3-dev, libgtkmm-3.0-dev, libgtk-3-dev,
- libicu-dev, libnotify-dev, libpam0g-dev, libprocps-dev, libx11-dev,
+ libicu-dev, libnotify-dev, libpam0g-dev, libx11-dev,
  libxinerama-dev, libxss-dev, libxtst-dev,
  libmspack-dev,
  libssl-dev,
@@ -19,7 +20,7 @@ Build-Depends:
  protobuf-compiler,
  libprotobuf-dev,
  protobuf-compiler-grpc,
- libgrpc++-dev,
+ libgrpc++-dev, libabsl-dev,
  golang-github-containerd-containerd-dev,
  golang-github-gogo-protobuf-dev,
 Standards-Version: 4.6.1
@@ -32,6 +33,8 @@ Architecture: amd64 i386 arm64
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}, pciutils, iproute2, lsb-release
 Recommends: ethtool, zerofree, fuse3
+Breaks: open-vm-tools-sdmp (<< 2:12.1.0-2~)
+Replaces: open-vm-tools-sdmp (<< 2:12.1.0-2~)
 Suggests: open-vm-tools-desktop, cloud-init,
  open-vm-tools-containerinfo, open-vm-tools-salt-minion [amd64]
 Description: Open VMware Tools for virtual machines hosted on VMware (CLI)
diff --git a/debian/open-vm-tools-desktop.lintian-overrides b/debian/open-vm-tools-desktop.lintian-overrides
index 0a6a323..2d8c49d 100644
--- a/debian/open-vm-tools-desktop.lintian-overrides
+++ b/debian/open-vm-tools-desktop.lintian-overrides
@@ -1,5 +1,5 @@
 # intentional setuid
-open-vm-tools-desktop: elevated-privileges usr/bin/vmware-user-suid-wrapper 4755 root/root
+open-vm-tools-desktop: elevated-privileges 4755 root/root [usr/bin/vmware-user-suid-wrapper]
 # not existing - https://github.com/vmware/open-vm-tools/issues/526
 open-vm-tools-desktop: no-manual-page usr/bin/vmware-user
 open-vm-tools-desktop: no-manual-page usr/bin/vmwgfxctrl
diff --git a/debian/patches/debian/grpc_1.51 b/debian/patches/debian/grpc_1.51
new file mode 100644
index 0000000..3f22581
--- /dev/null
+++ b/debian/patches/debian/grpc_1.51
@@ -0,0 +1,13 @@
+Index: pkg-open-vm-tools/open-vm-tools/services/plugins/containerInfo/Makefile.am
+===================================================================
+--- pkg-open-vm-tools.orig/open-vm-tools/services/plugins/containerInfo/Makefile.am
++++ pkg-open-vm-tools/open-vm-tools/services/plugins/containerInfo/Makefile.am
+@@ -63,6 +63,8 @@ libcontainerInfo_la_SOURCES += container
+ libcontainerInfo_la_CPPFLAGS += @GRPC_CPPFLAGS@
+ libcontainerInfo_la_LDFLAGS += -lprotobuf
+ libcontainerInfo_la_LDFLAGS += -lgrpc++
++libcontainerInfo_la_LDFLAGS += -lgpr
++libcontainerInfo_la_LDFLAGS += -labsl_synchronization
+ 
+ tasks.grpc.pb.cc containers.grpc.pb.cc: %.grpc.pb.cc : %.proto %.pb.cc
+ 	$(PROTOC) -I. -I$(GOGO_PROTOPATH) \
diff --git a/debian/patches/series b/debian/patches/series
index 1661073..c1bc1ff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 use-debian-pam
 debian/scsi-udev-rule
+debian/grpc_1.51
diff --git a/debian/rules b/debian/rules
index 71e2110..c5aa8ce 100755
--- a/debian/rules
+++ b/debian/rules
@@ -77,8 +77,6 @@ override_dh_auto_install:
 
 	mkdir -p debian/open-vm-tools-sdmp/usr/lib/$(DEB_HOST_MULTIARCH)/open-vm-tools/plugins/vmsvc/
 	mv debian/open-vm-tools/usr/lib/$(DEB_HOST_MULTIARCH)/open-vm-tools/plugins/vmsvc/libserviceDiscovery.so debian/open-vm-tools-sdmp/usr/lib/$(DEB_HOST_MULTIARCH)/open-vm-tools/plugins/vmsvc/
-	mv debian/open-vm-tools/usr/lib/$(DEB_HOST_MULTIARCH)/open-vm-tools/plugins/vmsvc/libguestStore.so debian/open-vm-tools-sdmp/usr/lib/$(DEB_HOST_MULTIARCH)/open-vm-tools/plugins/vmsvc/
-	mv debian/open-vm-tools/usr/lib/$(DEB_HOST_MULTIARCH)/open-vm-tools/plugins/vmsvc/libgdp.so debian/open-vm-tools-sdmp/usr/lib/$(DEB_HOST_MULTIARCH)/open-vm-tools/plugins/vmsvc/
 
 	mkdir -p debian/open-vm-tools-sdmp/usr/lib/$(DEB_HOST_MULTIARCH)/open-vm-tools/serviceDiscovery/scripts/
 	mv debian/open-vm-tools/usr/lib/$(DEB_HOST_MULTIARCH)/open-vm-tools/serviceDiscovery/scripts/* debian/open-vm-tools-sdmp/usr/lib/$(DEB_HOST_MULTIARCH)/open-vm-tools/serviceDiscovery/scripts/
diff --git a/open-vm-tools/ChangeLog b/open-vm-tools/ChangeLog
index 13479e9..f539f8e 100644
--- a/open-vm-tools/ChangeLog
+++ b/open-vm-tools/ChangeLog
@@ -1,3 +1,102 @@
+commit 0c740b5ffaacd814f402aba924e55dc8ea033b62
+Author: John Wolfe <[e-mail]>
+Date:   Tue Nov 29 13:11:04 2022 -0800
+
+    Update the ReleaseNotes.md for the 12.1.5 open-vm-tools release.
+
+commit 8958c3e0fa4b1f5ed4cb0ee98a967ddd73cd03ff
+Author: John Wolfe <[e-mail]>
+Date:   Tue Nov 29 13:07:17 2022 -0800
+
+    Prepare for the open-vm-tools 12.1.5 release.
+    - Update the tools version in the configure.ac.   Update the build numbers
+      buldNumber.h.
+
+commit 864ffc76c53e0523b08dad1d1a82a36f75e6f06c
+Author: John Wolfe <[e-mail]>
+Date:   Thu Nov 10 12:10:55 2022 -0800
+
+    Update the ChangeLog file with the changes in the 12.1.5 open-vm-tools release.
+     - plus the ChangeLog update of Aug. 23, 2022
+
+commit a205236af862e732c774a5c2b77b700ccfc73f25
+Author: John Wolfe <[e-mail]>
+Date:   Thu Nov 10 12:01:14 2022 -0800
+
+    Fix printf format type found by Coverity scan.
+    
+    printf format should be using %zu to print a size_t value.
+
+commit 0a5d9821a6a82ab773d41b7ae9afe9dc8cccff30
+Author: John Wolfe <[e-mail]>
+Date:   Thu Nov 10 12:01:14 2022 -0800
+
+    Avoid a vmtoolsd service error message if not on a VMware hypervisor.
+    
+    When open-vm-tools comes preinstalled in a base Linux release, the
+    vmtoolsd services are started automatically at system start
+    and desktop login.  If running on physical hardware or in a non-VMware
+    hypervisor, the services will emit an error message to the systemd's
+    logging service before stopping.
+    
+    This change removes the unwanted error message.
+
+commit bb64ec6aa24c123bb25d1c48a4c126efa4fda5bf
+Author: John Wolfe <[e-mail]>
+Date:   Thu Nov 10 12:01:14 2022 -0800
+
+    Add an example of a new deployPkg/wait-cloudinit-timeout setting to tools.conf.
+
+commit cd995a58b07a91d7804d9fdec5545a5fe11e9db9
+Author: John Wolfe <[e-mail]>
+Date:   Thu Nov 10 12:01:14 2022 -0800
+
+    Make Linux perl based customization work with the cloud-init workflow.
+    
+    To resolve issues seen where users want to set a vm's networking
+    and apply cloud-init userdata together before the vm is booted, the
+    deployPkg plugin has been modified to wait for cloud-init
+    execution to finish.  This allows cloud-init to finish execution
+    completely before the customization process triggers a reboot
+    of the guest.
+    
+    This change is solely in the deployPkg plugin side, so a user can get
+    this change by upgrading their open-vm-tools in the guest/template.
+    Crossport of change 10318445 and 10330918 from main to vmtools-prod-cpd.
+
+commit f7009c53afdab9a9507257c77bfeb30d8baaac8c
+Author: John Wolfe <[e-mail]>
+Date:   Thu Nov 10 12:01:14 2022 -0800
+
+    Add a null undo function to the vmbackup null provider.
+    
+    If a snapshot operation times out, vmbackup can attempt
+    to undo quiescing.  Since no quiescing is done for the null
+    backup provider, no undo function was provided.  If vmbackup
+    attempts to call the undo function, it dereferences a garbage
+    pointer resulting in a segfault.
+    
+    Rather than add null backup provider specific checks to vmbackup,
+    this change adds a null undo function to provide vmbackup with a
+    valid function pointer it can call.  The new undo function updates
+    the vmbackup state machine state with a new currentOpName, but
+    has no other effect.  currentOpName is set to the calling
+    function name, e.g. __FUNCTION__.
+
+commit db9cb277841ddd56e2665fd29e3ee8c6f37fe233
+Author: John Wolfe <[e-mail]>
+Date:   Thu Nov 10 12:01:14 2022 -0800
+
+    Prepare tools builds on vmtools-prod-cpd for the 12.1.5 update release.
+    
+    - Bump the tools version to 12.1.5.
+
+commit 6f5e4b13647b40a45c196dad76b1cb39cc6690b9
+Author: John Wolfe <[e-mail]>
+Date:   Tue Aug 23 14:59:44 2022 -0700
+
+    Update of the ChangeLog with the "open-vm-tools 12.1.0" release point marker.
+
 commit 196eee046dc54358275ee5130cd189cd686efb27
 Author: John Wolfe <[e-mail]>
 Date:   Tue Aug 23 14:52:28 2022 -0700
diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
index 3c05813..c133add 100644
--- a/open-vm-tools/configure.ac
+++ b/open-vm-tools/configure.ac
@@ -35,10 +35,10 @@
 ### Initialization
 ###
 
-TOOLS_VERSION="12.1.0"
+TOOLS_VERSION="12.1.5"
 AC_INIT(
    [open-vm-tools],
-   [12.1.0],
+   [12.1.5],
    [[e-mail]])
 
 # In order to make this configure script auto-detect situations where
diff --git a/open-vm-tools/lib/include/buildNumber.h b/open-vm-tools/lib/include/buildNumber.h
index 504ea8b..cad017b 100644
--- a/open-vm-tools/lib/include/buildNumber.h
+++ b/open-vm-tools/lib/include/buildNumber.h
@@ -1,12 +1,12 @@
 #define BUILD_NUMBER \
-	"build-20219665"
+	"build-20735119"
 #define BUILD_NUMBER_NUMERIC \
-	20219665
+	20735119
 #define BUILD_NUMBER_NUMERIC_STRING \
-	"20219665"
+	"20735119"
 #define PRODUCT_BUILD_NUMBER \
-	"product-build-37487"
+	"product-build-39265"
 #define PRODUCT_BUILD_NUMBER_NUMERIC \
-	37487
+	39265
 #define PRODUCT_BUILD_NUMBER_NUMERIC_STRING \
-	"37487"
+	"39265"
diff --git a/open-vm-tools/lib/include/conf.h b/open-vm-tools/lib/include/conf.h
index 282b9e0..cad1563 100644
--- a/open-vm-tools/lib/include/conf.h
+++ b/open-vm-tools/lib/include/conf.h
@@ -587,6 +587,12 @@
  */
 #define CONFNAME_DEPLOYPKG_ENABLE_CUST "enable-customization"
 
+/**
+ * How long does guest customization wait until cloud-init execution done
+ * Valid value range: 0 ~ 1800
+ */
+#define CONFNAME_DEPLOYPKG_WAIT_CLOUDINIT_TIMEOUT "wait-cloudinit-timeout"
+
 /*
  * END deployPkg goodies.
  ******************************************************************************
diff --git a/open-vm-tools/lib/include/deployPkg/linuxDeployment.h b/open-vm-tools/lib/include/deployPkg/linuxDeployment.h
index ea8b292..a145cc3 100644
--- a/open-vm-tools/lib/include/deployPkg/linuxDeployment.h
+++ b/open-vm-tools/lib/include/deployPkg/linuxDeployment.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2009-2019 VMware, Inc. All rights reserved.
+ * Copyright (C) 2009-2019, 2022 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
@@ -67,6 +67,25 @@ DeployPkg_SetProcessTimeout(uint16 timeout);
 /*
  *------------------------------------------------------------------------------
  *
+ * DeployPkg_SetWaitForCloudinitDoneTimeout
+ *
+ *     Set the timeout value of customization process waits for cloud-init
+ *     execution done before trigger reboot and after connect network adapters.
+ *
+ * @param timeout [in]
+ *     timeout value to be used for waiting for cloud-init execution done
+ *
+ *------------------------------------------------------------------------------
+ */
+
+IMGCUST_API void
+DeployPkg_SetWaitForCloudinitDoneTimeout(uint16 timeout);
+
+
+
+/*
+ *------------------------------------------------------------------------------
+ *
  * DeployPkg_SetLogger --
  *
  *      Give the deploy package an application specific logger.
diff --git a/open-vm-tools/lib/include/vm_tools_version.h b/open-vm-tools/lib/include/vm_tools_version.h
index 2435d4b..4af0e08 100644
--- a/open-vm-tools/lib/include/vm_tools_version.h
+++ b/open-vm-tools/lib/include/vm_tools_version.h
@@ -1709,15 +1709,22 @@ TOOLS_VERSION_UINT_TO_COMPONENTS(const ToolsVersion toolsVersion,   // IN
 #define   TOOLS_VERSION_SABRE_SAW_UPDATE1_V_BASE 5
 
 #ifndef RC_INVOKED
-#define   TOOLS_VERSION_NEXT TOOLS_VERSION_TO_UINT(TOOLS_VERSION_NEXT_V)
+#define   TOOLS_VERSION_MITER_SAW_RELEASE TOOLS_VERSION_TO_UINT(TOOLS_VERSION_MITER_SAW_RELEASE_V)
 #endif /* RC_INVOKED */
-#define   TOOLS_VERSION_NEXT_V_MJR  12
-#define   TOOLS_VERSION_NEXT_V_MNR  1
-#define   TOOLS_VERSION_NEXT_V_BASE 0
+#define   TOOLS_VERSION_MITER_SAW_RELEASE_V_MJR  12
+#define   TOOLS_VERSION_MITER_SAW_RELEASE_V_MNR  1
+#define   TOOLS_VERSION_MITER_SAW_RELEASE_V_BASE 0
 
-#define   TOOLS_VERSION_CURRENT        TOOLS_VERSION_NEXT
-#define   TOOLS_VERSION_CURRENT_STR    TOOLS_VERSION_TO_STR(TOOLS_VERSION_NEXT)
-#define   TOOLS_VERSION_CURRENT_CSV    TOOLS_VERSION_TO_CSV(TOOLS_VERSION_NEXT)
+#ifndef RC_INVOKED
+#define   TOOLS_VERSION_MITER_SAW_UPDATE1 TOOLS_VERSION_TO_UINT(TOOLS_VERSION_MITER_SAW_UPDATE1_V)
+#endif /* RC_INVOKED */
+#define   TOOLS_VERSION_MITER_SAW_UPDATE1_V_MJR  12
+#define   TOOLS_VERSION_MITER_SAW_UPDATE1_V_MNR  1
+#define   TOOLS_VERSION_MITER_SAW_UPDATE1_V_BASE 5
+
+#define   TOOLS_VERSION_CURRENT        TOOLS_VERSION_MITER_SAW_UPDATE1
+#define   TOOLS_VERSION_CURRENT_STR    TOOLS_VERSION_TO_STR(TOOLS_VERSION_MITER_SAW_UPDATE1)
+#define   TOOLS_VERSION_CURRENT_CSV    TOOLS_VERSION_TO_CSV(TOOLS_VERSION_MITER_SAW_UPDATE1)
 
 /*
  * The extended Tools version is the current Tools version with the
diff --git a/open-vm-tools/libDeployPkg/linuxDeployment.c b/open-vm-tools/libDeployPkg/linuxDeployment.c
index b1f9c8d..19863ca 100644
--- a/open-vm-tools/libDeployPkg/linuxDeployment.c
+++ b/open-vm-tools/libDeployPkg/linuxDeployment.c
@@ -98,6 +98,10 @@ VM_EMBED_VERSION(SYSIMAGE_VERSION_EXT_STR);
 
 // the maximum length of cloud-init version stdout
 #define MAX_LENGTH_CLOUDINIT_VERSION 256
+// the maximum length of cloud-init status stdout
+#define MAX_LENGTH_CLOUDINIT_STATUS 256
+// the default timeout of waiting for cloud-init execution done
+#define DEFAULT_TIMEOUT_WAIT_FOR_CLOUDINIT_DONE 30
 
 /*
  * Constant definitions
@@ -136,6 +140,16 @@ typedef enum USE_CLOUDINIT_ERROR_CODE {
    USE_CLOUDINIT_IGNORE,
 } USE_CLOUDINIT_ERROR_CODE;
 
+// the user-visible cloud-init application status code
+typedef enum CLOUDINIT_STATUS_CODE {
+   CLOUDINIT_STATUS_NOT_RUN = 0,
+   CLOUDINIT_STATUS_RUNNING,
+   CLOUDINIT_STATUS_DONE,
+   CLOUDINIT_STATUS_ERROR,
+   CLOUDINIT_STATUS_DISABLED,
+   CLOUDINIT_STATUS_UNKNOWN,
+} CLOUDINIT_STATUS_CODE;
+
 /*
  * Linked list definition
  *
@@ -191,6 +205,8 @@ static char* gDeployError = NULL;
 LogFunction sLog = NoLogging;
 static uint16 gProcessTimeout = DEPLOYPKG_PROCESSTIMEOUT_DEFAULT;
 static bool gProcessTimeoutSetByLauncher = false;
+static uint16 gWaitForCloudinitDoneTimeout =
+   DEFAULT_TIMEOUT_WAIT_FOR_CLOUDINIT_DONE;
 
 // .....................................................................................
 
@@ -226,6 +242,31 @@ DeployPkg_SetProcessTimeout(uint16 timeout)
    }
 }
 
+/*
+ *------------------------------------------------------------------------------
+ *
+ * DeployPkg_SetWaitForCloudinitDoneTimeout
+ *
+ *     Set the timeout value of customization process waits for cloud-init
+ *     execution done before trigger reboot and after connect network adapters.
+ *     Tools deployPkg plugin reads this timeout value from tools.conf and
+ *     checks if the timeout value is valid, then calls this API to set the
+ *     valid timeout value to gWaitForCloudinitDoneTimeout.
+ *
+ * @param timeout [in]
+ *     timeout value to be used for waiting for cloud-init execution done
+ *
+ *------------------------------------------------------------------------------
+ */
+
+void
+DeployPkg_SetWaitForCloudinitDoneTimeout(uint16 timeout)
+{
+   gWaitForCloudinitDoneTimeout = timeout;
+   sLog(log_debug, "Wait for cloud-init execution done timeout value: %d.",
+        gWaitForCloudinitDoneTimeout);
+}
+
 // .....................................................................................
 
 /**
@@ -364,7 +405,8 @@ SetCustomizationStatusInVmxEx(int customizationState,
          sLog(log_debug, "Got VMX response '%s'.", response);
          if (responseLength > responseBufferSize - 1) {
             sLog(log_warning,
-                 "The VMX response is too long (only %d chars are allowed).",
+                 "The VMX response is too long "
+                 "(only %"FMTSZ"u chars are allowed).",
                  responseBufferSize - 1);
             responseLength = responseBufferSize - 1;
          }
@@ -1183,13 +1225,14 @@ CopyFileToDirectory(const char* srcPath, const char* destPath,
  * - cloud-init is enabled.
  *
  * @param   [IN]  dirPath  Path where the package is extracted.
+ * @param   [IN]  ignoreCloudInit  whether ignore cloud-init workflow.
  * @returns the error code to use cloud-init work flow
  *
  *----------------------------------------------------------------------------
  * */
 
 static USE_CLOUDINIT_ERROR_CODE
-UseCloudInitWorkflow(const char* dirPath)
+UseCloudInitWorkflow(const char* dirPath, bool ignoreCloudInit)
 {
    static const char cfgName[] = "cust.cfg";
    static const char metadataName[] = "metadata";
@@ -1198,24 +1241,29 @@ UseCloudInitWorkflow(const char* dirPath)
    char cloudInitCommandOutput[MAX_LENGTH_CLOUDINIT_VERSION];
    int forkExecResult;
 
-   if (NULL == dirPath) {
-      return USE_CLOUDINIT_INTERNAL_ERROR;
-   }
-
-   // check if cust.cfg file exists
-   if (!CheckFileExist(dirPath, cfgName)) {
-      return USE_CLOUDINIT_NO_CUST_CFG;
-   }
-
    forkExecResult = ForkExecAndWaitCommand(cloudInitCommand,
                                            false,
                                            cloudInitCommandOutput,
                                            sizeof(cloudInitCommandOutput));
    if (forkExecResult != 0) {
-      sLog(log_info, "cloud-init is not installed.");
+      sLog(log_info, "Cloud-init is not installed.");
       return USE_CLOUDINIT_NOT_INSTALLED;
    } else {
-      sLog(log_info, "cloud-init is installed.");
+      sLog(log_info, "Cloud-init is installed.");
+      if (ignoreCloudInit) {
+         sLog(log_info,
+              "Ignoring cloud-init workflow according to header flags.");
+         return USE_CLOUDINIT_IGNORE;
+      }
+   }
+
+   if (NULL == dirPath) {
+      return USE_CLOUDINIT_INTERNAL_ERROR;
+   }
+
+   // check if cust.cfg file exists
+   if (!CheckFileExist(dirPath, cfgName)) {
+      return USE_CLOUDINIT_NO_CUST_CFG;
    }
 
    // If cloud-init metadata exists, check if cloud-init support to handle
@@ -1225,12 +1273,12 @@ UseCloudInitWorkflow(const char* dirPath)
    if (CheckFileExist(dirPath, metadataName)) {
       int major, minor;
       GetCloudinitVersion(cloudInitCommandOutput, &major, &minor);
-      sLog(log_info, "metadata exists, check cloud-init version...");
+      sLog(log_info, "Metadata exists, check cloud-init version...");
       if (major < CLOUDINIT_SUPPORT_RAW_DATA_MAJOR_VERSION ||
           (major == CLOUDINIT_SUPPORT_RAW_DATA_MAJOR_VERSION &&
            minor < CLOUDINIT_SUPPORT_RAW_DATA_MINOR_VERSION)) {
           sLog(log_info,
-               "cloud-init version %d.%d is older than required version %d.%d",
+               "Cloud-init version %d.%d is older than required version %d.%d.",
                major,
                minor,
                CLOUDINIT_SUPPORT_RAW_DATA_MAJOR_VERSION,
@@ -1251,6 +1299,113 @@ UseCloudInitWorkflow(const char* dirPath)
 
 /**
  *
+ * Function which gets the current cloud-init execution status.
+ * The status messages are copied from cloud-init offcial upstream
+ * https://github.com/canonical/cloud-init/blob/main/cloudinit/cmd/status.py
+ * These status messages are consistent since year 2017
+ *
+ * @returns the status code of cloud-init application
+ *
+ **/
+
+static CLOUDINIT_STATUS_CODE
+GetCloudinitStatus() {
+   // Cloud-init execution status messages
+   static const char* NOT_RUN = "not run";
+   static const char* RUNNING = "running";
+   static const char* DONE = "done";
+   static const char* ERROR = "error";
+   static const char* DISABLED = "disabled";
+
+   static const char cloudinitStatusCmd[] = "/usr/bin/cloud-init status";
+   char cloudinitStatusCmdOutput[MAX_LENGTH_CLOUDINIT_STATUS];
+   int forkExecResult;
+
+   forkExecResult = ForkExecAndWaitCommand(cloudinitStatusCmd,
+                                           false,
+                                           cloudinitStatusCmdOutput,
+                                           MAX_LENGTH_CLOUDINIT_STATUS);
+   if (forkExecResult != 0) {
+      sLog(log_info, "Unable to get cloud-init status.");
+      return CLOUDINIT_STATUS_UNKNOWN;
+   } else {
+      if (strstr(cloudinitStatusCmdOutput, NOT_RUN) != NULL) {
+         sLog(log_info, "Cloud-init status is '%s'.", NOT_RUN);
+         return CLOUDINIT_STATUS_NOT_RUN;
+      } else if (strstr(cloudinitStatusCmdOutput, RUNNING) != NULL) {
+         sLog(log_info, "Cloud-init status is '%s'.", RUNNING);
+         return CLOUDINIT_STATUS_RUNNING;
+      } else if (strstr(cloudinitStatusCmdOutput, DONE) != NULL) {
+         sLog(log_info, "Cloud-init status is '%s'.", DONE);
+         return CLOUDINIT_STATUS_DONE;
+      } else if (strstr(cloudinitStatusCmdOutput, ERROR) != NULL) {
+         sLog(log_info, "Cloud-init status is '%s'.", ERROR);
+         return CLOUDINIT_STATUS_ERROR;
+      } else if (strstr(cloudinitStatusCmdOutput, DISABLED) != NULL) {
+         sLog(log_info, "Cloud-init status is '%s'.", DISABLED);
+         return CLOUDINIT_STATUS_DISABLED;
+      } else {
+         sLog(log_warning, "Cloud-init status is unknown.");
+         return CLOUDINIT_STATUS_UNKNOWN;
+      }
+   }
+}
+
+
+/**
+ *
+ * Function which waits for cloud-init execution done.
+ *
+ * This function is called only when below conditions are fulfilled:
+ * - cloud-init is installed
+ * - guest os reboot is not skipped (so traditional GOSC workflow only)
+ * - deployment processed successfully in guest
+ *
+ * Default waiting timeout is DEFAULT_TIMEOUT_WAIT_FOR_CLOUDINIT_DONE seconds,
+ * when the timeout is reached, reboot will be triggered no matter what the
+ * cloud-init execution status is then.
+ * The timeout can be overwritten by the value which is set in tools.conf,
+ * if 0 is set in tools.conf, no waiting will be performed.
+ *
+ **/
+
+static void
+WaitForCloudinitDone() {
+   const int CheckStatusInterval = 5;
+   int timeoutSec = 0;
+   int elapsedSec = 0;
+   CLOUDINIT_STATUS_CODE cloudinitStatus = CLOUDINIT_STATUS_UNKNOWN;
+
+   // No waiting when gWaitForCloudinitDoneTimeout is set to 0
+   if (gWaitForCloudinitDoneTimeout == 0) {
+      return;
+   }
+
+   timeoutSec = gWaitForCloudinitDoneTimeout;
+
+   while (1) {
+      if (elapsedSec == timeoutSec) {
+         sLog(log_info, "Timed out waiting for cloud-init execution done.");
+         return;
+      }
+      if (elapsedSec % CheckStatusInterval == 0) {
+         cloudinitStatus = GetCloudinitStatus();
+         // CLOUDINIT_STATUS_NOT_RUN and CLOUDINIT_STATUS_RUNNING represent
+         // cloud-init execution has not finished
+         if (cloudinitStatus != CLOUDINIT_STATUS_NOT_RUN &&
+             cloudinitStatus != CLOUDINIT_STATUS_RUNNING) {
+            sLog(log_info, "Cloud-init execution is not on-going.");
+            return;
+         }
+      }
+      sleep(1);
+      elapsedSec++;
+   }
+}
+
+
+/**
+ *
  * Function which cleans up the deployment directory imcDirPath.
  * This function is called when customization deployment is completed or
  * any unexpected error happens before deployment begins.
@@ -1316,6 +1471,7 @@ Deploy(const char* packageName)
    char *imcDirPath = NULL;
    USE_CLOUDINIT_ERROR_CODE useCloudInitWorkflow = USE_CLOUDINIT_IGNORE;
    int imcDirPathSize = 0;
+   bool ignoreCloudInit = false;
    TransitionState(NULL, INPROGRESS);
 
    // Notify the vpx of customization in-progress state
@@ -1400,11 +1556,8 @@ Deploy(const char* packageName)
       }
    }
 
-   if (!(flags & VMWAREDEPLOYPKG_HEADER_FLAGS_IGNORE_CLOUD_INIT)) {
-      useCloudInitWorkflow = UseCloudInitWorkflow(imcDirPath);
-   } else {
-      sLog(log_info, "Ignoring cloud-init.");
-   }
+   ignoreCloudInit = flags & VMWAREDEPLOYPKG_HEADER_FLAGS_IGNORE_CLOUD_INIT;
+   useCloudInitWorkflow = UseCloudInitWorkflow(imcDirPath, ignoreCloudInit);
 
    sLog(log_info, "UseCloudInitWorkflow return: %d", useCloudInitWorkflow);
 
@@ -1511,6 +1664,10 @@ Deploy(const char* packageName)
 
    //Reset the guest OS
    if (!sSkipReboot && !deploymentResult) {
+      if (useCloudInitWorkflow != USE_CLOUDINIT_NOT_INSTALLED) {
+         sLog(log_info, "Do not trigger reboot if cloud-init is executing.");
+         WaitForCloudinitDone();
+      }
       pid_t pid = fork();
       if (pid == -1) {
          sLog(log_error, "Failed to fork: '%s'.", strerror(errno));
diff --git a/open-vm-tools/services/plugins/deployPkg/deployPkg.c b/open-vm-tools/services/plugins/deployPkg/deployPkg.c
index 4d70765..b1f0324 100644
--- a/open-vm-tools/services/plugins/deployPkg/deployPkg.c
+++ b/open-vm-tools/services/plugins/deployPkg/deployPkg.c
@@ -59,6 +59,9 @@ using namespace ImgCustCommon;
 
 // Using 3600s as the upper limit of timeout value in tools.conf.
 #define MAX_TIMEOUT_FROM_TOOLCONF 3600
+// Using 1800s as the upper limit of waiting for cloud-init execution done
+// timeout value in tools.conf.
+#define MAX_TIMEOUT_WAIT_FOR_CLOUDINIT_DONE 1800
 
 static char *DeployPkgGetTempDir(void);
 
@@ -90,6 +93,7 @@ DeployPkgDeployPkgInGuest(ToolsAppCtx *ctx,    // IN: app context
    ToolsDeployPkgError ret = TOOLSDEPLOYPKG_ERROR_SUCCESS;
 #ifndef _WIN32
    int processTimeout;
+   int waitForCloudinitDoneTimeout;
 #endif
 
    /*
@@ -156,10 +160,10 @@ DeployPkgDeployPkgInGuest(ToolsAppCtx *ctx,    // IN: app context
     * Using 0 as the default value of CONFNAME_DEPLOYPKG_PROCESSTIMEOUT in tools.conf
     */
    processTimeout =
-        VMTools_ConfigGetInteger(ctx->config,
-                                 CONFGROUPNAME_DEPLOYPKG,
-                                 CONFNAME_DEPLOYPKG_PROCESSTIMEOUT,
-                                 0);
+      VMTools_ConfigGetInteger(ctx->config,
+                               CONFGROUPNAME_DEPLOYPKG,
+                               CONFNAME_DEPLOYPKG_PROCESSTIMEOUT,
+                               0);
    if (processTimeout > 0 && processTimeout <= MAX_TIMEOUT_FROM_TOOLCONF) {
       DeployPkgLog_Log(log_debug, "[%s] %s in tools.conf: %d",
                        CONFGROUPNAME_DEPLOYPKG,
@@ -174,6 +178,41 @@ DeployPkgDeployPkgInGuest(ToolsAppCtx *ctx,    // IN: app context
       DeployPkgLog_Log(log_debug, "The valid timeout value range: 1 ~ %d",
                        MAX_TIMEOUT_FROM_TOOLCONF);
    }
+
+   /*
+    * Get timeout of waiting for cloud-init execution done from tools.conf.
+    * Only when a valid 'timeout' got from tools.conf, deployPkg will call
+    * DeployPkg_SetWaitForCloudinitDoneTimeout to overwrite the default timeout
+    * of waiting for cloud-init execution done.
+    * The valid value range is from 0 to MAX_TIMEOUT_WAIT_FOR_CLOUDINIT_DONE.
+    * Return an invalid value -1 if CONFNAME_DEPLOYPKG_WAIT_CLOUDINIT_TIMEOUT is
+    * not set in tools.conf.
+    */
+   waitForCloudinitDoneTimeout =
+      VMTools_ConfigGetInteger(ctx->config,
+                               CONFGROUPNAME_DEPLOYPKG,
+                               CONFNAME_DEPLOYPKG_WAIT_CLOUDINIT_TIMEOUT,
+                               -1);
+   if (waitForCloudinitDoneTimeout >= 0 &&
+       waitForCloudinitDoneTimeout <= MAX_TIMEOUT_WAIT_FOR_CLOUDINIT_DONE) {
+      DeployPkgLog_Log(log_debug, "[%s] %s in tools.conf: %d",
+                       CONFGROUPNAME_DEPLOYPKG,
+                       CONFNAME_DEPLOYPKG_WAIT_CLOUDINIT_TIMEOUT,
+                       waitForCloudinitDoneTimeout);
+      DeployPkg_SetWaitForCloudinitDoneTimeout(waitForCloudinitDoneTimeout);
+   } else {
+      if (waitForCloudinitDoneTimeout != -1) {
+         DeployPkgLog_Log(log_debug,
+                          "Ignore invalid value %d from tools.conf [%s] %s",
+                          waitForCloudinitDoneTimeout,
+                          CONFGROUPNAME_DEPLOYPKG,
+                          CONFNAME_DEPLOYPKG_WAIT_CLOUDINIT_TIMEOUT);
+      }
+      DeployPkgLog_Log(log_debug, "The valid [%s] %s value range: 0 ~ %d",
+                       CONFGROUPNAME_DEPLOYPKG,
+                       CONFNAME_DEPLOYPKG_WAIT_CLOUDINIT_TIMEOUT,
+                       MAX_TIMEOUT_WAIT_FOR_CLOUDINIT_DONE);
+   }
 #endif
 
    if (0 != DeployPkg_DeployPackageFromFile(pkgFile)) {
diff --git a/open-vm-tools/services/plugins/vmbackup/nullProvider.c b/open-vm-tools/services/plugins/vmbackup/nullProvider.c
index 1abc5f6..e07d2b7 100644
--- a/open-vm-tools/services/plugins/vmbackup/nullProvider.c
+++ b/open-vm-tools/services/plugins/vmbackup/nullProvider.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2010-2016 VMware, Inc. All rights reserved.
+ * Copyright (C) 2010-2016, 2022 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
@@ -243,6 +243,32 @@ VmBackupNullSnapshotDone(VmBackupState *state,
    return TRUE;
 }
 
+
+/*
+ ******************************************************************************
+ * VmBackupNullUndo --                                                  */ /**
+ *
+ * Update the state machine state with the currentOpName.
+ *
+ * Can be called when snapshot times out.  See PR2993571 and PR3003917.
+ *
+ * @param[in] state        the backup state
+ * @param[in] clientData   client data
+ *
+ * @return TRUE
+ *
+ ******************************************************************************
+ */
+
+static Bool
+VmBackupNullUndo(VmBackupState *state,
+                 void *clientData)
+{
+   g_debug("*** %s\n", __FUNCTION__);
+   VmBackup_SetCurrentOp(state, NULL, NULL, __FUNCTION__);
+   return TRUE;
+}
+
 #endif
 
 /*
@@ -281,6 +307,9 @@ VmBackup_NewNullProvider(void)
 
    provider = g_new(VmBackupSyncProvider, 1);
    provider->start = VmBackupNullStart;
+#if !defined(_WIN32)
+   provider->undo = VmBackupNullUndo;
+#endif
    provider->snapshotDone = VmBackupNullSnapshotDone;
    provider->release = VmBackupNullRelease;
    provider->clientData = NULL;
diff --git a/open-vm-tools/services/vmtoolsd/mainPosix.c b/open-vm-tools/services/vmtoolsd/mainPosix.c
index cd8f2db..9ca9bad 100644
--- a/open-vm-tools/services/vmtoolsd/mainPosix.c
+++ b/open-vm-tools/services/vmtoolsd/mainPosix.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2008-2020 VMware, Inc. All rights reserved.
+ * Copyright (C) 2008-2020,2022 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
@@ -178,8 +178,6 @@ main(int argc,
     * Check that environment is a VM
     */
    if (!VmCheck_IsVirtualWorld()) {
-      g_printerr("Error: %s must be run inside a virtual machine"
-                 " on a VMware hypervisor product.\n", argv[0]);
       goto exit;
    }
 
diff --git a/open-vm-tools/tools.conf b/open-vm-tools/tools.conf
index 2577d32..a7d994c 100644
--- a/open-vm-tools/tools.conf
+++ b/open-vm-tools/tools.conf
@@ -455,6 +455,18 @@
 # to disable guest customization
 #enable-customization=false
 
+# This "wait-cloudinit-timeout" option controls how long does guest
+# customization wait for cloud-init execution done when it detects cloud-init
+# is available in guest.
+# Guest customization will continue executing as soon as it detects cloud-init
+# execution done within this option's value in seconds.
+# If cloud-init is still running beyond this option's value in seconds, guest
+# customization will continue executing regardless cloud-init execution status.
+# Minimum valid value is 0 second, set to 0 to disable waiting.
+# Maximum valid value is 1800 seconds (30 minutes).
+# Default value is 30 seconds.
+#wait-cloudinit-timeout=30
+
 [cbhelper]
 
 # The carbonblack helper plugin is only available for Windows.