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

Merge pull request #1136 from rasa/1057-add-floppy-files-to-vmware-vmx 

builder/vmware-vmx: add floppy_files support
This commit is contained in:
Ross Smith II 2014-05-06 17:21:30 -07:00
parent bbcd7fc86e bea167a48e
commit 36e154c775
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,6 +55,9 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
&vmwcommon.StepOutputDir{ &vmwcommon.StepOutputDir{
Force: b.config.PackerForce, Force: b.config.PackerForce,
}, },
&common.StepCreateFloppy{
Files: b.config.FloppyFiles,
},
&StepCloneVMX{ &StepCloneVMX{
OutputDir: b.config.OutputDir, OutputDir: b.config.OutputDir,
Path: b.config.SourcePath, Path: b.config.SourcePath,

7
builder/vmware/vmx/config.go
View File

@ -19,9 +19,10 @@ type Config struct {
vmwcommon.SSHConfig `mapstructure:",squash"` vmwcommon.SSHConfig `mapstructure:",squash"`
vmwcommon.VMXConfig `mapstructure:",squash"` vmwcommon.VMXConfig `mapstructure:",squash"`
SkipCompaction bool `mapstructure:"skip_compaction"` FloppyFiles []string `mapstructure:"floppy_files"`
SourcePath string `mapstructure:"source_path"` SkipCompaction bool `mapstructure:"skip_compaction"`
VMName string `mapstructure:"vm_name"` SourcePath string `mapstructure:"source_path"`
VMName string `mapstructure:"vm_name"`
tpl *packer.ConfigTemplate tpl *packer.ConfigTemplate
} }