Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
packer
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kristopher Ruzic
packer
Commits
de5c38e6
Commit
de5c38e6
authored
Jun 09, 2014
by
StefanScherer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
skip adding floppy again in vmx_data_post step
parent
1dcaf171
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
6 deletions
+12
-6
builder/vmware/common/step_configure_vmx.go
builder/vmware/common/step_configure_vmx.go
+10
-6
builder/vmware/iso/builder.go
builder/vmware/iso/builder.go
+1
-0
builder/vmware/vmx/builder.go
builder/vmware/vmx/builder.go
+1
-0
No files found.
builder/vmware/common/step_configure_vmx.go
View file @
de5c38e6
...
...
@@ -18,6 +18,7 @@ import (
// vmx_path string
type
StepConfigureVMX
struct
{
CustomData
map
[
string
]
string
SkipFloppy
bool
}
func
(
s
*
StepConfigureVMX
)
Run
(
state
multistep
.
StateBag
)
multistep
.
StepAction
{
...
...
@@ -56,12 +57,15 @@ func (s *StepConfigureVMX) Run(state multistep.StateBag) multistep.StepAction {
vmxData
[
k
]
=
v
}
// Set a floppy disk if we have one
if
floppyPathRaw
,
ok
:=
state
.
GetOk
(
"floppy_path"
);
ok
{
log
.
Println
(
"Floppy path present, setting in VMX"
)
vmxData
[
"floppy0.present"
]
=
"TRUE"
vmxData
[
"floppy0.filetype"
]
=
"file"
vmxData
[
"floppy0.filename"
]
=
floppyPathRaw
.
(
string
)
// Set a floppy disk, but only if we should
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"
)
vmxData
[
"floppy0.present"
]
=
"TRUE"
vmxData
[
"floppy0.filetype"
]
=
"file"
vmxData
[
"floppy0.filename"
]
=
floppyPathRaw
.
(
string
)
}
}
if
err
:=
WriteVMX
(
vmxPath
,
vmxData
);
err
!=
nil
{
...
...
builder/vmware/iso/builder.go
View file @
de5c38e6
...
...
@@ -370,6 +370,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
&
vmwcommon
.
StepCleanVMX
{},
&
vmwcommon
.
StepConfigureVMX
{
CustomData
:
b
.
config
.
VMXDataPost
,
SkipFloppy
:
true
,
},
&
vmwcommon
.
StepCompactDisk
{
Skip
:
b
.
config
.
SkipCompaction
,
...
...
builder/vmware/vmx/builder.go
View file @
de5c38e6
...
...
@@ -97,6 +97,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
&
vmwcommon
.
StepCleanVMX
{},
&
vmwcommon
.
StepConfigureVMX
{
CustomData
:
b
.
config
.
VMXDataPost
,
SkipFloppy
:
true
,
},
&
vmwcommon
.
StepCompactDisk
{
Skip
:
b
.
config
.
SkipCompaction
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment