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

fmt

This commit is contained in:
Mitchell Hashimoto 2014-09-03 21:27:54 -07:00
parent dc74c2bbdd
commit 67afff5ede
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builder/vmware/common/driver_player5.go
View File

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

4
builder/vmware/common/step_configure_vmx.go
View File

@ -18,7 +18,7 @@ import (
// vmx_path string
type StepConfigureVMX struct {
CustomData map[string]string
SkipFloppy bool
SkipFloppy bool
}
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
if ! s.SkipFloppy {
if !s.SkipFloppy {
// Set a floppy disk if we have one
if floppyPathRaw, ok := state.GetOk("floppy_path"); ok {
log.Println("Floppy path present, setting in VMX")

2
builder/vmware/iso/builder.go
View File

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

2
builder/vmware/vmx/builder.go
View File

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