pull/1391/merge
Mitchell Hashimoto 12 years ago
parent dc74c2bbdd
commit 67afff5ede

@ -198,4 +198,4 @@ func (d *Player5Driver) DhcpLeasesPath(device string) string {
func (d *Player5Driver) VmnetnatConfPath() string { func (d *Player5Driver) VmnetnatConfPath() string {
return playerVmnetnatConfPath() return playerVmnetnatConfPath()
} }

@ -18,7 +18,7 @@ import (
// vmx_path string // vmx_path string
type StepConfigureVMX struct { type StepConfigureVMX struct {
CustomData map[string]string CustomData map[string]string
SkipFloppy bool SkipFloppy bool
} }
func (s *StepConfigureVMX) Run(state multistep.StateBag) multistep.StepAction { func (s *StepConfigureVMX) Run(state multistep.StateBag) multistep.StepAction {
@ -58,7 +58,7 @@ func (s *StepConfigureVMX) Run(state multistep.StateBag) multistep.StepAction {
} }
// Set a floppy disk, but only if we should // Set a floppy disk, but only if we should
if ! s.SkipFloppy { if !s.SkipFloppy {
// Set a floppy disk if we have one // Set a floppy disk if we have one
if floppyPathRaw, ok := state.GetOk("floppy_path"); ok { if floppyPathRaw, ok := state.GetOk("floppy_path"); ok {
log.Println("Floppy path present, setting in VMX") log.Println("Floppy path present, setting in VMX")

@ -369,7 +369,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
&vmwcommon.StepCleanFiles{}, &vmwcommon.StepCleanFiles{},
&vmwcommon.StepConfigureVMX{ &vmwcommon.StepConfigureVMX{
CustomData: b.config.VMXDataPost, CustomData: b.config.VMXDataPost,
SkipFloppy: true, SkipFloppy: true,
}, },
&vmwcommon.StepCleanVMX{}, &vmwcommon.StepCleanVMX{},
&vmwcommon.StepCompactDisk{ &vmwcommon.StepCompactDisk{

@ -96,7 +96,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
&vmwcommon.StepCleanFiles{}, &vmwcommon.StepCleanFiles{},
&vmwcommon.StepConfigureVMX{ &vmwcommon.StepConfigureVMX{
CustomData: b.config.VMXDataPost, CustomData: b.config.VMXDataPost,
SkipFloppy: true, SkipFloppy: true,
}, },
&vmwcommon.StepCleanVMX{}, &vmwcommon.StepCleanVMX{},
&vmwcommon.StepCompactDisk{ &vmwcommon.StepCompactDisk{

Loading…
Cancel
Save