From 7d5ea43f411911a002549a013d5626fc477b92b1 Mon Sep 17 00:00:00 2001
From: Megan Marsh <megan@hashicorp.com>
Date: Thu, 13 Dec 2018 09:58:24 -0800
Subject: [PATCH] revert the hddorder being added to the vmx template, since
 it's breaking things for some of our users.

---
 builder/vmware/iso/step_create_vmx.go | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/builder/vmware/iso/step_create_vmx.go b/builder/vmware/iso/step_create_vmx.go
index 5a46c14ef..2a7f64c45 100644
--- a/builder/vmware/iso/step_create_vmx.go
+++ b/builder/vmware/iso/step_create_vmx.go
@@ -24,8 +24,6 @@ type vmxTemplateData struct {
 	CpuCount   string
 	MemorySize string
 
-	HDD_BootOrder string
-
 	SCSI_Present         string
 	SCSI_diskAdapterType string
 	SATA_Present         string
@@ -166,7 +164,6 @@ func (s *stepCreateVMX) Run(_ context.Context, state multistep.StateBag) multist
 		NVME_Present:         "FALSE",
 
 		DiskType:                   "scsi",
-		HDD_BootOrder:              "scsi0:0",
 		CDROMType:                  "ide",
 		CDROMType_PrimarySecondary: "0",
 
@@ -189,20 +186,17 @@ func (s *stepCreateVMX) Run(_ context.Context, state multistep.StateBag) multist
 		templateData.DiskType = "ide"
 		templateData.CDROMType = "ide"
 		templateData.CDROMType_PrimarySecondary = "1"
-		templateData.HDD_BootOrder = "ide0:0"
 	case "sata":
 		templateData.SATA_Present = "TRUE"
 		templateData.DiskType = "sata"
 		templateData.CDROMType = "sata"
 		templateData.CDROMType_PrimarySecondary = "1"
-		templateData.HDD_BootOrder = "sata0:0"
 	case "nvme":
 		templateData.NVME_Present = "TRUE"
 		templateData.DiskType = "nvme"
 		templateData.SATA_Present = "TRUE"
 		templateData.CDROMType = "sata"
 		templateData.CDROMType_PrimarySecondary = "0"
-		templateData.HDD_BootOrder = "nvme0:0"
 	case "scsi":
 		diskAdapterType = "lsilogic"
 		fallthrough
@@ -212,7 +206,6 @@ func (s *stepCreateVMX) Run(_ context.Context, state multistep.StateBag) multist
 		templateData.DiskType = "scsi"
 		templateData.CDROMType = "ide"
 		templateData.CDROMType_PrimarySecondary = "0"
-		templateData.HDD_BootOrder = "scsi0:0"
 	}
 
 	/// Handle the cdrom adapter type. If the disk adapter type and the
@@ -476,7 +469,6 @@ nvram = "{{ .Name }}.nvram"
 
 floppy0.present = "FALSE"
 bios.bootOrder = "hdd,cdrom"
-bios.hddOrder = "{{ .HDD_BootOrder }}"
 
 // Configuration
 extendedConfigFile = "{{ .Name }}.vmxf"