From de5c38e6c5405f82663ccfb9afebb600c88b0da9 Mon Sep 17 00:00:00 2001
From: StefanScherer <scherer_stefan@icloud.com>
Date: Mon, 9 Jun 2014 01:02:21 +0200
Subject: [PATCH] skip adding floppy again in vmx_data_post step

---
 builder/vmware/common/step_configure_vmx.go | 16 ++++++++++------
 builder/vmware/iso/builder.go               |  1 +
 builder/vmware/vmx/builder.go               |  1 +
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/builder/vmware/common/step_configure_vmx.go b/builder/vmware/common/step_configure_vmx.go
index 0d53c44e9..556975023 100644
--- a/builder/vmware/common/step_configure_vmx.go
+++ b/builder/vmware/common/step_configure_vmx.go
@@ -18,6 +18,7 @@ import (
 //   vmx_path string
 type StepConfigureVMX struct {
 	CustomData map[string]string
+	SkipFloppy  bool
 }
 
 func (s *StepConfigureVMX) Run(state multistep.StateBag) multistep.StepAction {
@@ -56,12 +57,15 @@ func (s *StepConfigureVMX) Run(state multistep.StateBag) multistep.StepAction {
 		vmxData[k] = v
 	}
 
-	// Set a floppy disk if we have one
-	if floppyPathRaw, ok := state.GetOk("floppy_path"); ok {
-		log.Println("Floppy path present, setting in VMX")
-		vmxData["floppy0.present"] = "TRUE"
-		vmxData["floppy0.filetype"] = "file"
-		vmxData["floppy0.filename"] = floppyPathRaw.(string)
+	// Set a floppy disk, but only if we should
+	if ! s.SkipFloppy {
+		// Set a floppy disk if we have one
+		if floppyPathRaw, ok := state.GetOk("floppy_path"); ok {
+			log.Println("Floppy path present, setting in VMX")
+			vmxData["floppy0.present"] = "TRUE"
+			vmxData["floppy0.filetype"] = "file"
+			vmxData["floppy0.filename"] = floppyPathRaw.(string)
+		}
 	}
 
 	if err := WriteVMX(vmxPath, vmxData); err != nil {
diff --git a/builder/vmware/iso/builder.go b/builder/vmware/iso/builder.go
index d1f24fa64..f0711ae8f 100644
--- a/builder/vmware/iso/builder.go
+++ b/builder/vmware/iso/builder.go
@@ -370,6 +370,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 		&vmwcommon.StepCleanVMX{},
 		&vmwcommon.StepConfigureVMX{
 			CustomData: b.config.VMXDataPost,
+			SkipFloppy:  true,
 		},
 		&vmwcommon.StepCompactDisk{
 			Skip: b.config.SkipCompaction,
diff --git a/builder/vmware/vmx/builder.go b/builder/vmware/vmx/builder.go
index e75f62b57..7c2b770bb 100644
--- a/builder/vmware/vmx/builder.go
+++ b/builder/vmware/vmx/builder.go
@@ -97,6 +97,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 		&vmwcommon.StepCleanVMX{},
 		&vmwcommon.StepConfigureVMX{
 			CustomData: b.config.VMXDataPost,
+			SkipFloppy:  true,
 		},
 		&vmwcommon.StepCompactDisk{
 			Skip: b.config.SkipCompaction,