From a5b21c59ba3012cc10bbffc6940916ba5e0de4b2 Mon Sep 17 00:00:00 2001
From: Mikhail Zholobov <mzholobov@parallels.com>
Date: Thu, 27 Nov 2014 17:13:50 +0300
Subject: [PATCH] builder/parallels: Move setting the boot order to the
 separated step

---
 builder/parallels/iso/builder.go             |  1 +
 builder/parallels/iso/step_attach_iso.go     | 16 +-------
 builder/parallels/iso/step_set_boot_order.go | 42 ++++++++++++++++++++
 3 files changed, 44 insertions(+), 15 deletions(-)
 create mode 100644 builder/parallels/iso/step_set_boot_order.go

diff --git a/builder/parallels/iso/builder.go b/builder/parallels/iso/builder.go
index 5b4c628a1..e5e42e8e7 100644
--- a/builder/parallels/iso/builder.go
+++ b/builder/parallels/iso/builder.go
@@ -256,6 +256,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 		new(stepHTTPServer),
 		new(stepCreateVM),
 		new(stepCreateDisk),
+		new(stepSetBootOrder),
 		new(stepAttachISO),
 		&parallelscommon.StepAttachParallelsTools{
 			ParallelsToolsMode: b.config.ParallelsToolsMode,
diff --git a/builder/parallels/iso/step_attach_iso.go b/builder/parallels/iso/step_attach_iso.go
index 188846331..049f2edf3 100644
--- a/builder/parallels/iso/step_attach_iso.go
+++ b/builder/parallels/iso/step_attach_iso.go
@@ -26,23 +26,9 @@ func (s *stepAttachISO) Run(state multistep.StateBag) multistep.StepAction {
 	ui := state.Get("ui").(packer.Ui)
 	vmName := state.Get("vmName").(string)
 
-	// Set new boot order
-	ui.Say("Setting the boot order...")
-	command := []string{
-		"set", vmName,
-		"--device-bootorder", fmt.Sprintf("hdd0 cdrom0 net0"),
-	}
-
-	if err := driver.Prlctl(command...); err != nil {
-		err := fmt.Errorf("Error setting the boot order: %s", err)
-		state.Put("error", err)
-		ui.Error(err.Error())
-		return multistep.ActionHalt
-	}
-
 	// Attach the disk to the cdrom0 device. We couldn't use a separated device because it is failed to boot in PD9 [GH-1667]
 	ui.Say("Attaching ISO to the default CD/DVD ROM device...")
-	command = []string{
+	command := []string{
 		"set", vmName,
 		"--device-set", "cdrom0",
 		"--image", isoPath,
diff --git a/builder/parallels/iso/step_set_boot_order.go b/builder/parallels/iso/step_set_boot_order.go
new file mode 100644
index 000000000..0b98dfc68
--- /dev/null
+++ b/builder/parallels/iso/step_set_boot_order.go
@@ -0,0 +1,42 @@
+package iso
+
+import (
+	"fmt"
+	"github.com/mitchellh/multistep"
+	parallelscommon "github.com/mitchellh/packer/builder/parallels/common"
+	"github.com/mitchellh/packer/packer"
+)
+
+// This step sets the device boot order for the virtual machine.
+//
+// Uses:
+//   driver Driver
+//   ui packer.Ui
+//   vmName string
+//
+// Produces:
+type stepSetBootOrder struct{}
+
+func (s *stepSetBootOrder) Run(state multistep.StateBag) multistep.StepAction {
+	driver := state.Get("driver").(parallelscommon.Driver)
+	ui := state.Get("ui").(packer.Ui)
+	vmName := state.Get("vmName").(string)
+
+	// Set new boot order
+	ui.Say("Setting the boot order...")
+	command := []string{
+		"set", vmName,
+		"--device-bootorder", fmt.Sprintf("hdd0 cdrom0 net0"),
+	}
+
+	if err := driver.Prlctl(command...); err != nil {
+		err := fmt.Errorf("Error setting the boot order: %s", err)
+		state.Put("error", err)
+		ui.Error(err.Error())
+		return multistep.ActionHalt
+	}
+
+	return multistep.ActionContinue
+}
+
+func (s *stepSetBootOrder) Cleanup(state multistep.StateBag) {}