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

Merge pull request #5363 from batzen/patch-1 

Fixes #4880 by always using EnableDynamicMemory
This commit is contained in:
Matthew Hooker 2017-09-25 18:14:30 -05:00 committed by GitHub
parent 08a52f1c57 c1aba87b39
commit eabcec6809
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
builder/hyperv/common/step_create_vm.go
View File

@ -45,26 +45,24 @@ func (s *StepCreateVM) Run(state multistep.StateBag) multistep.StepAction {
err = driver.SetVirtualMachineCpuCount(s.VMName, s.Cpu) err = driver.SetVirtualMachineCpuCount(s.VMName, s.Cpu)
if err != nil { if err != nil {
err := fmt.Errorf("Error creating setting virtual machine cpu: %s", err) err := fmt.Errorf("Error setting virtual machine cpu count: %s", err)
state.Put("error", err) state.Put("error", err)
ui.Error(err.Error()) ui.Error(err.Error())
return multistep.ActionHalt return multistep.ActionHalt
} }
if s.EnableDynamicMemory { err = driver.SetVirtualMachineDynamicMemory(s.VMName, s.EnableDynamicMemory)
err = driver.SetVirtualMachineDynamicMemory(s.VMName, s.EnableDynamicMemory) if err != nil {
if err != nil { err := fmt.Errorf("Error setting virtual machine dynamic memory: %s", err)
err := fmt.Errorf("Error creating setting virtual machine dynamic memory: %s", err) state.Put("error", err)
state.Put("error", err) ui.Error(err.Error())
ui.Error(err.Error()) return multistep.ActionHalt
return multistep.ActionHalt
}
} }
if s.EnableMacSpoofing { if s.EnableMacSpoofing {
err = driver.SetVirtualMachineMacSpoofing(s.VMName, s.EnableMacSpoofing) err = driver.SetVirtualMachineMacSpoofing(s.VMName, s.EnableMacSpoofing)
if err != nil { if err != nil {
err := fmt.Errorf("Error creating setting virtual machine mac spoofing: %s", err) err := fmt.Errorf("Error setting virtual machine mac spoofing: %s", err)
state.Put("error", err) state.Put("error", err)
ui.Error(err.Error()) ui.Error(err.Error())
return multistep.ActionHalt return multistep.ActionHalt
@ -85,7 +83,7 @@ func (s *StepCreateVM) Run(state multistep.StateBag) multistep.StepAction {
//This is only supported on Windows 10 and Windows Server 2016 onwards //This is only supported on Windows 10 and Windows Server 2016 onwards
err = driver.SetVirtualMachineVirtualizationExtensions(s.VMName, s.EnableVirtualizationExtensions) err = driver.SetVirtualMachineVirtualizationExtensions(s.VMName, s.EnableVirtualizationExtensions)
if err != nil { if err != nil {
err := fmt.Errorf("Error creating setting virtual machine virtualization extensions: %s", err) err := fmt.Errorf("Error setting virtual machine virtualization extensions: %s", err)
state.Put("error", err) state.Put("error", err)
ui.Error(err.Error()) ui.Error(err.Error())
return multistep.ActionHalt return multistep.ActionHalt