From c81a486f347363c9de4f6ea4a179f15492d0935c Mon Sep 17 00:00:00 2001
From: Israel Shirk <israelshirk@gmail.com>
Date: Fri, 4 Sep 2015 10:37:48 -0600
Subject: [PATCH] Rearranges vmware builders to put compaction before VMX
 finalization to avoid stomping VMX changes

---
 builder/vmware/iso/builder.go | 6 +++---
 builder/vmware/vmx/builder.go | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/builder/vmware/iso/builder.go b/builder/vmware/iso/builder.go
index f2489c50f..1742f3149 100755
--- a/builder/vmware/iso/builder.go
+++ b/builder/vmware/iso/builder.go
@@ -318,6 +318,9 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 			Timeout: b.config.ShutdownTimeout,
 		},
 		&vmwcommon.StepCleanFiles{},
+		&vmwcommon.StepCompactDisk{
+			Skip: b.config.SkipCompaction,
+		},
 		&vmwcommon.StepConfigureVMX{
 			CustomData: b.config.VMXDataPost,
 			SkipFloppy: true,
@@ -326,9 +329,6 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 		&StepUploadVMX{
 			RemoteType: b.config.RemoteType,
 		},
-		&vmwcommon.StepCompactDisk{
-			Skip: b.config.SkipCompaction,
-		},
 	}
 
 	// Run!
diff --git a/builder/vmware/vmx/builder.go b/builder/vmware/vmx/builder.go
index aa86d3669..66eb69f37 100644
--- a/builder/vmware/vmx/builder.go
+++ b/builder/vmware/vmx/builder.go
@@ -108,14 +108,14 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 			Timeout: b.config.ShutdownTimeout,
 		},
 		&vmwcommon.StepCleanFiles{},
+		&vmwcommon.StepCompactDisk{
+			Skip: b.config.SkipCompaction,
+		},
 		&vmwcommon.StepConfigureVMX{
 			CustomData: b.config.VMXDataPost,
 			SkipFloppy: true,
 		},
 		&vmwcommon.StepCleanVMX{},
-		&vmwcommon.StepCompactDisk{
-			Skip: b.config.SkipCompaction,
-		},
 	}
 
 	// Run the steps.