iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Parallels errors while creating floppy disk GH-1225 

Patch applied with modifications - tests updated to pass.
This commit is contained in:
Paul Palmer 2014-06-06 15:54:19 +02:00 committed by Rickard von Essen
parent 1dcaf17168
commit 5a8f56b6ad
2 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
builder/parallels/common/step_attach_floppy.go
View File

@ -33,15 +33,25 @@ func (s *StepAttachFloppy) 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)
ui.Say("Deleting any current floppy disk...")
// Delete the floppy disk controller
del_command := []string{
"set", vmName,
"--device-del", "fdd0",
}
if err := driver.Prlctl(del_command...); err != nil {
state.Put("error", fmt.Errorf("Error deleting floppy: %s", err))
}
ui.Say("Attaching floppy disk...") ui.Say("Attaching floppy disk...")
// Create the floppy disk controller // Create the floppy disk controller
command := []string{ add_command := []string{
"set", vmName, "set", vmName,
"--device-add", "fdd", "--device-add", "fdd",
"--image", floppyPath, "--image", floppyPath,
"--connect",
} }
if err := driver.Prlctl(command...); err != nil { if err := driver.Prlctl(add_command...); err != nil {
state.Put("error", fmt.Errorf("Error adding floppy: %s", err)) state.Put("error", fmt.Errorf("Error adding floppy: %s", err))
return multistep.ActionHalt return multistep.ActionHalt
} }

19
builder/parallels/common/step_attach_floppy_test.go
View File

@ -36,17 +36,30 @@ func TestStepAttachFloppy(t *testing.T) {
t.Fatal("should NOT have error") t.Fatal("should NOT have error")
} }
if len(driver.PrlctlCalls) != 1 { if len(driver.PrlctlCalls) != 2 {
t.Fatal("not enough calls to prlctl") t.Fatal("not enough calls to prlctl")
} }
if driver.PrlctlCalls[0][0] != "set" { if driver.PrlctlCalls[0][0] != "set" {
t.Fatal("bad call") t.Fatal("bad call")
} }
if driver.PrlctlCalls[0][2] != "--device-add" { if driver.PrlctlCalls[0][2] != "--device-del" {
t.Fatal("bad call") t.Fatal("bad call")
} }
if driver.PrlctlCalls[0][3] != "fdd" { if driver.PrlctlCalls[0][3] != "fdd0" {
t.Fatal("bad call")
}
if driver.PrlctlCalls[1][0] != "set" {
t.Fatal("bad call")
}
if driver.PrlctlCalls[1][2] != "--device-add" {
t.Fatal("bad call")
}
if driver.PrlctlCalls[1][3] != "fdd" {
t.Fatal("bad call")
}
if driver.PrlctlCalls[1][6] != "--connect" {
t.Fatal("bad call") t.Fatal("bad call")
} }
} }