builder/parallels: Move setting the boot order to the separated step
This commit is contained in:
parent
05affceaef
commit
a5b21c59ba
|
@ -256,6 +256,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
|
||||||
new(stepHTTPServer),
|
new(stepHTTPServer),
|
||||||
new(stepCreateVM),
|
new(stepCreateVM),
|
||||||
new(stepCreateDisk),
|
new(stepCreateDisk),
|
||||||
|
new(stepSetBootOrder),
|
||||||
new(stepAttachISO),
|
new(stepAttachISO),
|
||||||
¶llelscommon.StepAttachParallelsTools{
|
¶llelscommon.StepAttachParallelsTools{
|
||||||
ParallelsToolsMode: b.config.ParallelsToolsMode,
|
ParallelsToolsMode: b.config.ParallelsToolsMode,
|
||||||
|
|
|
@ -26,23 +26,9 @@ func (s *stepAttachISO) Run(state multistep.StateBag) multistep.StepAction {
|
||||||
ui := state.Get("ui").(packer.Ui)
|
ui := state.Get("ui").(packer.Ui)
|
||||||
vmName := state.Get("vmName").(string)
|
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]
|
// 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...")
|
ui.Say("Attaching ISO to the default CD/DVD ROM device...")
|
||||||
command = []string{
|
command := []string{
|
||||||
"set", vmName,
|
"set", vmName,
|
||||||
"--device-set", "cdrom0",
|
"--device-set", "cdrom0",
|
||||||
"--image", isoPath,
|
"--image", isoPath,
|
||||||
|
|
|
@ -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) {}
|
Loading…
Reference in New Issue