Merge pull request #7357 from e-mow/issue-7140

Issue 7140

builder/vmware/common/driver_esx5.go

@@ -68,7 +68,7 @@ func (d *ESX5Driver) Clone(dst, src string, linked bool) error {
 		return fmt.Errorf("Failed to copy the vmx file %s: %s", srcVmx, err)
 	}
 
-	filesToClone, err := d.run(nil, "find", strconv.Quote(srcDir), "! -name '*.vmdk' ! -name '*.vmx' -type f ! -size 0")
+	filesToClone, err := d.run(nil, "find", strconv.Quote(srcDir), "! -name '*.vmdk' ! -name '*.vmx' ! -name '*.vmxf' -type f ! -size 0")
 	if err != nil {
 		return fmt.Errorf("Failed to get the file list to copy: %s", err)
 	}

builder/vmware/common/step_configure_vmx.go

@@ -102,6 +102,17 @@ func (s *StepConfigureVMX) Run(_ context.Context, state multistep.StateBag) mult
 		}
 	}
 
+	// Set the extendedConfigFile setting for the .vmxf filename to the VMName
+	// if displayName is not set. This is needed so that when VMWare creates
+	// the .vmxf file it matches the displayName if it is set. When just using
+	// the sisplayName if it was empty VMWare would make a file named ".vmxf".
+	// The ".vmxf" file would not get deleted when the VM got deleted.
+	if s.DisplayName != "" {
+		vmxData["extendedconfigfile"] = fmt.Sprintf("%s.vmxf", s.DisplayName)
+	} else {
+		vmxData["extendedconfigfile"] = fmt.Sprintf("%s.vmxf", s.VMName)
+	}
+
 	err = WriteVMX(vmxPath, vmxData)
 
 	if err != nil {