From 5e1ea753d4fa7fe4c463557d3543a6c6ac7292bc Mon Sep 17 00:00:00 2001 From: Marc Siegfriedt Date: Wed, 1 Jul 2015 11:30:39 -0700 Subject: [PATCH] Fixed case sensitive issue with VMX entries not being overwritten --- builder/vmware/common/step_clean_vmx.go | 4 ++-- builder/vmware/vmx/step_clone_vmx.go | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) mode change 100644 => 100755 builder/vmware/common/step_clean_vmx.go mode change 100644 => 100755 builder/vmware/vmx/step_clone_vmx.go diff --git a/builder/vmware/common/step_clean_vmx.go b/builder/vmware/common/step_clean_vmx.go old mode 100644 new mode 100755 index bf76f5863..44bf4c407 --- a/builder/vmware/common/step_clean_vmx.go +++ b/builder/vmware/common/step_clean_vmx.go @@ -51,8 +51,8 @@ func (s StepCleanVMX) Run(state multistep.StateBag) multistep.StepAction { ui.Message("Detaching ISO from CD-ROM device...") - vmxData[ide+"devicetype"] = "cdrom-raw" - vmxData[ide+"filename"] = "auto detect" + vmxData[ide+"deviceType"] = "cdrom-raw" + vmxData[ide+"fileName"] = "auto detect" } ui.Message("Disabling VNC server...") diff --git a/builder/vmware/vmx/step_clone_vmx.go b/builder/vmware/vmx/step_clone_vmx.go old mode 100644 new mode 100755 index a020e1627..1dbae678a --- a/builder/vmware/vmx/step_clone_vmx.go +++ b/builder/vmware/vmx/step_clone_vmx.go @@ -38,14 +38,14 @@ func (s *StepCloneVMX) Run(state multistep.StateBag) multistep.StepAction { } var diskName string - if _, ok := vmxData["scsi0:0.filename"]; ok { - diskName = vmxData["scsi0:0.filename"] + if _, ok := vmxData["scsi0:0.fileName"]; ok { + diskName = vmxData["scsi0:0.fileName"] } - if _, ok := vmxData["sata0:0.filename"]; ok { - diskName = vmxData["sata0:0.filename"] + if _, ok := vmxData["sata0:0.fileName"]; ok { + diskName = vmxData["sata0:0.fileName"] } - if _, ok := vmxData["ide0:0.filename"]; ok { - diskName = vmxData["ide0:0.filename"] + if _, ok := vmxData["ide0:0.fileName"]; ok { + diskName = vmxData["ide0:0.fileName"] } if diskName == "" { err := fmt.Errorf("Root disk filename could not be found!")