diff --git a/drivers/virtualbox/virtualbox.go b/drivers/virtualbox/virtualbox.go index 4e42202548..e7dc7f986e 100644 --- a/drivers/virtualbox/virtualbox.go +++ b/drivers/virtualbox/virtualbox.go @@ -182,7 +182,7 @@ func (d *Driver) Create() error { if d.Boot2DockerURL != "" { isoURL = d.Boot2DockerURL log.Infof("Downloading %s from %s...", isoFilename, isoURL) - if err := b2dutils.DownloadISO(imgPath, isoFilename, isoURL); err != nil { + if err := b2dutils.DownloadISO(d.storePath, isoFilename, isoURL); err != nil { return err } } else { @@ -199,11 +199,11 @@ func (d *Driver) Create() error { return err } } - } - isoDest := filepath.Join(d.storePath, isoFilename) - if err := utils.CopyFile(commonIsoPath, isoDest); err != nil { - return err + isoDest := filepath.Join(d.storePath, isoFilename) + if err := utils.CopyFile(commonIsoPath, isoDest); err != nil { + return err + } } log.Infof("Creating SSH key...") diff --git a/drivers/vmwarefusion/fusion_darwin.go b/drivers/vmwarefusion/fusion_darwin.go index a5158be62b..92aaa7b82b 100644 --- a/drivers/vmwarefusion/fusion_darwin.go +++ b/drivers/vmwarefusion/fusion_darwin.go @@ -216,7 +216,7 @@ func (d *Driver) Create() error { if d.Boot2DockerURL != "" { isoURL = d.Boot2DockerURL log.Infof("Downloading boot2docker.iso from %s...", isoURL) - if err := b2dutils.DownloadISO(imgPath, isoFilename, isoURL); err != nil { + if err := b2dutils.DownloadISO(d.storePath, isoFilename, isoURL); err != nil { return err } } else { @@ -244,11 +244,11 @@ func (d *Driver) Create() error { return err } } - } - isoDest := filepath.Join(d.storePath, isoFilename) - if err := utils.CopyFile(commonIsoPath, isoDest); err != nil { - return err + isoDest := filepath.Join(d.storePath, isoFilename) + if err := utils.CopyFile(commonIsoPath, isoDest); err != nil { + return err + } } log.Infof("Creating SSH key...") diff --git a/drivers/vmwarevsphere/vsphere.go b/drivers/vmwarevsphere/vsphere.go index 614e20b26e..9e1fda05ed 100644 --- a/drivers/vmwarevsphere/vsphere.go +++ b/drivers/vmwarevsphere/vsphere.go @@ -301,7 +301,7 @@ func (d *Driver) Create() error { if d.Boot2DockerURL != "" { isoURL = d.Boot2DockerURL log.Infof("Downloading boot2docker.iso from %s...", isoURL) - if err := b2dutils.DownloadISO(imgPath, isoFilename, isoURL); err != nil { + if err := b2dutils.DownloadISO(d.storePath, isoFilename, isoURL); err != nil { return err } @@ -334,14 +334,12 @@ func (d *Driver) Create() error { return err } - } - } - - isoDest := filepath.Join(d.storePath, isoFilename) - if err := utils.CopyFile(commonIsoPath, isoDest); err != nil { - return err + isoDest := filepath.Join(d.storePath, isoFilename) + if err := utils.CopyFile(commonIsoPath, isoDest); err != nil { + return err + } } log.Infof("Generating SSH Keypair...")