From b08dd28b85f6f6f4d56b785c0b2c2e7860c89219 Mon Sep 17 00:00:00 2001
From: Megan Marsh <megan@hashicorp.com>
Date: Mon, 14 Sep 2020 11:20:34 -0700
Subject: [PATCH] skip slot 7 in disk creation so we don't use reserved slot

---
 builder/vmware/common/step_create_disks.go | 7 ++++++-
 builder/vmware/iso/step_create_vmx.go      | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/builder/vmware/common/step_create_disks.go b/builder/vmware/common/step_create_disks.go
index 2bd5bfc91..4bca0f453 100644
--- a/builder/vmware/common/step_create_disks.go
+++ b/builder/vmware/common/step_create_disks.go
@@ -45,8 +45,13 @@ func (s *StepCreateDisks) Run(ctx context.Context, state multistep.StateBag) mul
 	}
 	// Additional disks
 	if len(s.AdditionalDiskSize) > 0 {
+		incrementer := 1
 		for i, diskSize := range s.AdditionalDiskSize {
-			path := filepath.Join(*s.OutputDir, fmt.Sprintf("%s-%d.vmdk", s.DiskName, i+1))
+			// scsi slot 7 is reserved, so we skip it.
+			if i+incrementer == 7 {
+				incrementer = 2
+			}
+			path := filepath.Join(*s.OutputDir, fmt.Sprintf("%s-%d.vmdk", s.DiskName, i+incrementer))
 			diskFullPaths = append(diskFullPaths, path)
 			size := fmt.Sprintf("%dM", uint64(diskSize))
 			diskSizes = append(diskSizes, size)
diff --git a/builder/vmware/iso/step_create_vmx.go b/builder/vmware/iso/step_create_vmx.go
index d73336a9a..96f79a7f7 100644
--- a/builder/vmware/iso/step_create_vmx.go
+++ b/builder/vmware/iso/step_create_vmx.go
@@ -115,9 +115,14 @@ func (s *stepCreateVMX) Run(ctx context.Context, state multistep.StateBag) multi
 
 	// Mount extra vmdks we created earlier.
 	if len(config.AdditionalDiskSize) > 0 {
+		incrementer := 1
 		for i := range config.AdditionalDiskSize {
+			// slot 7 is special and reserved, so we need to skip that index.
+			if i+1 == 7 {
+				incrementer = 2
+			}
 			ictx.Data = &additionalDiskTemplateData{
-				DiskNumber: i + 1,
+				DiskNumber: i + incrementer,
 				DiskName:   config.DiskName,
 			}