docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix boot2docker import regression 

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
This commit is contained in:
Nathan LeClaire 2015-11-06 17:10:41 -08:00
parent 9775f9ec04
commit ad757310fb
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/virtualbox/disk.go
View File

@ -11,8 +11,8 @@ type VirtualDisk struct {
Path string Path string
} }
func (d *Driver) getVMDiskInfo() (*VirtualDisk, error) { func (d *Driver) getVMDiskInfo(name string) (*VirtualDisk, error) {
out, err := d.vbmOut("showvminfo", d.MachineName, "--machinereadable") out, err := d.vbmOut("showvminfo", name, "--machinereadable")
if err != nil { if err != nil {
return nil, err return nil, err
} }

4
drivers/virtualbox/virtualbox.go
View File

@ -249,7 +249,7 @@ func (d *Driver) Create() error {
// make sure vm is stopped // make sure vm is stopped
_ = d.vbm("controlvm", name, "poweroff") _ = d.vbm("controlvm", name, "poweroff")
diskInfo, err := d.getVMDiskInfo() diskInfo, err := d.getVMDiskInfo(name)
if err != nil { if err != nil {
return err return err
} }
@ -263,7 +263,7 @@ func (d *Driver) Create() error {
} }
log.Debugf("Importing VM settings...") log.Debugf("Importing VM settings...")
vmInfo, err := d.getVMInfo() vmInfo, err := d.getVMInfo(name)
if err != nil { if err != nil {
return err return err
} }

4
drivers/virtualbox/vm.go
View File

@ -12,8 +12,8 @@ type VirtualBoxVM struct {
Memory int Memory int
} }
func (d *Driver) getVMInfo() (*VirtualBoxVM, error) { func (d *Driver) getVMInfo(name string) (*VirtualBoxVM, error) {
out, err := d.vbmOut("showvminfo", d.MachineName, "--machinereadable") out, err := d.vbmOut("showvminfo", name, "--machinereadable")
if err != nil { if err != nil {
return nil, err return nil, err
} }