From bde6ad3faca2ae8dcc82e86140d42b9a8c7df53f Mon Sep 17 00:00:00 2001 From: Evan Hazlett Date: Wed, 18 Mar 2015 14:08:47 -0400 Subject: [PATCH] fixed b2d url bug with fusion / vsphere Signed-off-by: Evan Hazlett --- drivers/vmwarefusion/fusion_darwin.go | 13 ++++++------- drivers/vmwarevsphere/vsphere.go | 10 +++++----- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/drivers/vmwarefusion/fusion_darwin.go b/drivers/vmwarefusion/fusion_darwin.go index d52d9b8bdc..a5158be62b 100644 --- a/drivers/vmwarefusion/fusion_darwin.go +++ b/drivers/vmwarefusion/fusion_darwin.go @@ -211,16 +211,14 @@ func (d *Driver) Create() error { if err := os.Mkdir(imgPath, 0700); err != nil { return err } - } if d.Boot2DockerURL != "" { isoURL = d.Boot2DockerURL log.Infof("Downloading boot2docker.iso from %s...", isoURL) - if err := b2dutils.DownloadISO(commonIsoPath, isoFilename, isoURL); err != nil { + if err := b2dutils.DownloadISO(imgPath, isoFilename, isoURL); err != nil { return err } - } else { // TODO: until vmw tools are merged into b2d master // we will use the iso from the vmware team. @@ -246,10 +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 5fcdb92b4b..614e20b26e 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(commonIsoPath, isoFilename, isoURL); err != nil { + if err := b2dutils.DownloadISO(imgPath, isoFilename, isoURL); err != nil { return err } @@ -336,11 +336,11 @@ func (d *Driver) Create() error { } } - 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 }