Skip to content

P
packer
Commit 2c8ea2b6 authored by Ross Smith II's avatar Ross Smith II
Browse files
Options

Merge pull request #1361 from sneal/do-not-add-floppy-files-to-vmx 

Do not re-add floppy disk files to VMX
parents e62e1226 05ebc8f3
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
builder/vmware/iso/builder.go
View file @ 2c8ea2b6
...@@ -367,10 +367,10 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe ...@@ -367,10 +367,10 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
Timeout: b.config.ShutdownTimeout, Timeout: b.config.ShutdownTimeout,
}, },
&vmwcommon.StepCleanFiles{}, &vmwcommon.StepCleanFiles{},
&vmwcommon.StepCleanVMX{},
&vmwcommon.StepConfigureVMX{ &vmwcommon.StepConfigureVMX{
CustomData: b.config.VMXDataPost, CustomData: b.config.VMXDataPost,
}, },
&vmwcommon.StepCleanVMX{},
&vmwcommon.StepCompactDisk{ &vmwcommon.StepCompactDisk{
Skip: b.config.SkipCompaction, Skip: b.config.SkipCompaction,
}, },
......
builder/vmware/vmx/builder.go
View file @ 2c8ea2b6
...@@ -94,10 +94,10 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe ...@@ -94,10 +94,10 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
Timeout: b.config.ShutdownTimeout, Timeout: b.config.ShutdownTimeout,
}, },
&vmwcommon.StepCleanFiles{}, &vmwcommon.StepCleanFiles{},
&vmwcommon.StepCleanVMX{},
&vmwcommon.StepConfigureVMX{ &vmwcommon.StepConfigureVMX{
CustomData: b.config.VMXDataPost, CustomData: b.config.VMXDataPost,
}, },
&vmwcommon.StepCleanVMX{},
&vmwcommon.StepCompactDisk{ &vmwcommon.StepCompactDisk{
Skip: b.config.SkipCompaction, Skip: b.config.SkipCompaction,
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7