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
7d1b95c9
Commit
7d1b95c9
authored
Jan 16, 2015
by
Danny Lockard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Formatting fix :)
parent
fdcf10dc
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
20 deletions
+20
-20
builder/virtualbox/common/driver.go
builder/virtualbox/common/driver.go
+3
-3
builder/virtualbox/common/driver_4_2.go
builder/virtualbox/common/driver_4_2.go
+1
-1
builder/virtualbox/common/driver_mock.go
builder/virtualbox/common/driver_mock.go
+4
-4
builder/virtualbox/iso/step_create_disk.go
builder/virtualbox/iso/step_create_disk.go
+12
-12
No files found.
builder/virtualbox/common/driver.go
View file @
7d1b95c9
...
...
@@ -18,9 +18,9 @@ import (
type
Driver
interface
{
// Create a SATA controller.
CreateSATAController
(
vm
string
,
controller
string
)
error
// Create a SCSI controller.
CreateSCSIController
(
vm
string
,
controller
string
)
error
// Create a SCSI controller.
CreateSCSIController
(
vm
string
,
controller
string
)
error
// Delete a VM by name
Delete
(
string
)
error
...
...
builder/virtualbox/common/driver_4_2.go
View file @
7d1b95c9
...
...
@@ -42,7 +42,7 @@ func (d *VBox42Driver) CreateSCSIController(vmName string, name string) error {
"storagectl"
,
vmName
,
"--name"
,
name
,
"--add"
,
"scsi"
,
"--controller"
,
"LSILogic"
,
"--controller"
,
"LSILogic"
,
}
return
d
.
VBoxManage
(
command
...
)
...
...
builder/virtualbox/common/driver_mock.go
View file @
7d1b95c9
...
...
@@ -9,7 +9,7 @@ type DriverMock struct {
CreateSATAControllerController
string
CreateSATAControllerErr
error
CreateSCSIControllerVM
string
CreateSCSIControllerVM
string
CreateSCSIControllerController
string
CreateSCSIControllerErr
error
...
...
@@ -54,9 +54,9 @@ func (d *DriverMock) CreateSATAController(vm string, controller string) error {
}
func
(
d
*
DriverMock
)
CreateSCSIController
(
vm
string
,
controller
string
)
error
{
d
.
CreateSCSIControllerVM
=
vm
d
.
CreateSCSIControllerController
=
vm
return
d
.
CreateSCSIControllerErr
d
.
CreateSCSIControllerVM
=
vm
d
.
CreateSCSIControllerController
=
vm
return
d
.
CreateSCSIControllerErr
}
func
(
d
*
DriverMock
)
Delete
(
name
string
)
error
{
...
...
builder/virtualbox/iso/step_create_disk.go
View file @
7d1b95c9
...
...
@@ -63,24 +63,24 @@ func (s *stepCreateDisk) Run(state multistep.StateBag) multistep.StepAction {
}
}
if
config
.
HardDriveInterface
==
"scsi"
{
if
err
:=
driver
.
CreateSCSIController
(
vmName
,
"SCSI Controller"
);
err
!=
nil
{
err
:=
fmt
.
Errorf
(
"Error creating disk controller: %s"
,
err
)
state
.
Put
(
"error"
,
err
)
ui
.
Error
(
err
.
Error
())
return
multistep
.
ActionHalt
}
}
if
config
.
HardDriveInterface
==
"scsi"
{
if
err
:=
driver
.
CreateSCSIController
(
vmName
,
"SCSI Controller"
);
err
!=
nil
{
err
:=
fmt
.
Errorf
(
"Error creating disk controller: %s"
,
err
)
state
.
Put
(
"error"
,
err
)
ui
.
Error
(
err
.
Error
())
return
multistep
.
ActionHalt
}
}
// Attach the disk to the controller
controllerName
:=
"IDE Controller"
if
config
.
HardDriveInterface
==
"sata"
{
controllerName
=
"SATA Controller"
}
if
config
.
HardDriveInterface
==
"scsi"
{
controllerName
=
"SCSI Controller"
}
if
config
.
HardDriveInterface
==
"scsi"
{
controllerName
=
"SCSI Controller"
}
command
=
[]
string
{
"storageattach"
,
vmName
,
...
...
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