cloud-init-dev team mailing list archive

[Scott Moser <smoser@xxxxxxxxxx>]

Scott Moser has proposed merging ~smoser/cloud-init:bug/disable_vmware_customization-fix into cloud-init:master.

Requested reviews:
  Sankar Tanguturi (sankaraditya)
  cloud init development team (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~smoser/cloud-init/+git/cloud-init/+merge/318493
-- 
Your team cloud init development team is requested to review the proposed merge of ~smoser/cloud-init:bug/disable_vmware_customization-fix into cloud-init:master.

diff --git a/tools/ds-identify b/tools/ds-identify
index 34bf064..75799c3 100755
--- a/tools/ds-identify
+++ b/tools/ds-identify
@@ -574,8 +574,9 @@ ovf_vmware_guest_customization() {
     done
     [ -n "$found" ] || return 1
 
-    # disable_vmware_customization defaults to False.
-    # any value then other than false means disabled.
+    # vmware customization is disabled by default
+    # (disable_vmware_customization=true). If it is set to false, then
+    # user has requested customization.
     local key="disable_vmware_customization"
     local match="" bp="${PATH_CLOUD_CONFD}/cloud.cfg"
     match="$bp.d/*[Oo][Vv][Ff]*.cfg"
@@ -583,7 +584,7 @@ ovf_vmware_guest_customization() {
         debug 2 "${_RET_fname} set $key to $_RET"
         case "$_RET" in
             0|false|False) return 0;;
-            *) return;;
+            *) return 1;;
         esac
     fi