Fixed case sensitive issue with VMX entries not being overwritten

This commit is contained in:
Marc Siegfriedt 2015-07-01 11:30:39 -07:00
parent aa954c9406
commit 5e1ea753d4
2 changed files with 8 additions and 8 deletions

4
builder/vmware/common/step_clean_vmx.go Normal file → Executable file
View File

@ -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...")

12
builder/vmware/vmx/step_clone_vmx.go Normal file → Executable file
View File

@ -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!")