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

StepCreateSnapshot.Run() will stop and create an error if the virtual machine is still running 

Removed left over code from StepCreateSnapshot.Cleanup()
This commit is contained in:
Thomas Meckel 2019-07-26 11:35:12 +02:00
parent d9b8623f64
commit e7583de847
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
builder/virtualbox/vm/step_create_snapshot.go
View File

@ -4,7 +4,6 @@ import (
"context" "context"
"fmt" "fmt"
"log" "log"
"time"
vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common" vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common"
"github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/helper/multistep"
@ -20,7 +19,18 @@ func (s *StepCreateSnapshot) Run(_ context.Context, state multistep.StateBag) mu
driver := state.Get("driver").(vboxcommon.Driver) driver := state.Get("driver").(vboxcommon.Driver)
ui := state.Get("ui").(packer.Ui) ui := state.Get("ui").(packer.Ui)
if s.TargetSnapshot != "" { if s.TargetSnapshot != "" {
time.Sleep(10 * time.Second) // Wait after the Vm has been shutdown, otherwise creating the snapshot might make the VM unstartable running, err := driver.IsRunning(s.Name)
if err != nil {
err = fmt.Errorf("Failed to test if VM %s is still running: %s", s.Name, err)
} else if running {
err = fmt.Errorf("VM %s is still running. Unable to create snapshot %s", s.Name, s.TargetSnapshot)
}
if err != nil {
state.Put("error", err)
ui.Error(err.Error())
return multistep.ActionHalt
}
ui.Say(fmt.Sprintf("Creating snapshot %s on virtual machine %s", s.TargetSnapshot, s.Name)) ui.Say(fmt.Sprintf("Creating snapshot %s on virtual machine %s", s.TargetSnapshot, s.Name))
snapshotTree, err := driver.LoadSnapshots(s.Name) snapshotTree, err := driver.LoadSnapshots(s.Name)
if err != nil { if err != nil {
@ -56,19 +66,4 @@ func (s *StepCreateSnapshot) Run(_ context.Context, state multistep.StateBag) mu
return multistep.ActionContinue return multistep.ActionContinue
} }
func (s *StepCreateSnapshot) Cleanup(state multistep.StateBag) { func (s *StepCreateSnapshot) Cleanup(state multistep.StateBag) {}
/*
driver := state.Get("driver").(vboxcommon.Driver)
if s.TargetSnapshot != "" {
ui := state.Get("ui").(packer.Ui)
ui.Say(fmt.Sprintf("Deleting snapshot %s on virtual machine %s", s.TargetSnapshot, s.Name))
err := driver.DeleteSnapshot(s.Name, s.TargetSnapshot)
if err != nil {
err := fmt.Errorf("Error cleaning up created snaphot VM: %s", err)
state.Put("error", err)
ui.Error(err.Error())
return
}
}
*/
}