From ad757310fb8a8b918a8ea9d3cfb630666d043be6 Mon Sep 17 00:00:00 2001
From: Nathan LeClaire <nathan.leclaire@gmail.com>
Date: Fri, 6 Nov 2015 17:10:41 -0800
Subject: [PATCH] Fix boot2docker import regression
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
---
drivers/virtualbox/disk.go | 4 ++--
drivers/virtualbox/virtualbox.go | 4 ++--
drivers/virtualbox/vm.go | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/virtualbox/disk.go b/drivers/virtualbox/disk.go
index 966a425565..d99f1f395c 100644
--- a/drivers/virtualbox/disk.go
+++ b/drivers/virtualbox/disk.go
@@ -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
}
diff --git a/drivers/virtualbox/virtualbox.go b/drivers/virtualbox/virtualbox.go
index 948ba38991..da6709fa77 100644
--- a/drivers/virtualbox/virtualbox.go
+++ b/drivers/virtualbox/virtualbox.go
@@ -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
}
diff --git a/drivers/virtualbox/vm.go b/drivers/virtualbox/vm.go
index b32d75580f..a130243997 100644
--- a/drivers/virtualbox/vm.go
+++ b/drivers/virtualbox/vm.go
@@ -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
}