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

Merge pull request #2212 from nathanleclaire/b2d_regression 

Fix boot2docker import regression
This commit is contained in:
David Gageot 2015-11-07 16:13:11 +01:00
parent 3577ccda54 ad757310fb
commit a5a53bfbdd
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
}
func (d *Driver) getVMDiskInfo() (*VirtualDisk, error) {
out, err := d.vbmOut("showvminfo", d.MachineName, "--machinereadable")
func (d *Driver) getVMDiskInfo(name string) (*VirtualDisk, error) {
out, err := d.vbmOut("showvminfo", name, "--machinereadable")
if err != nil {
return nil, err
}

4
drivers/virtualbox/virtualbox.go
View File

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

4
drivers/virtualbox/vm.go
View File

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