iSharkFly-Docs/packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builder/vmware: Path related fixes in esx5 driver

Browse Source 
- Fix mkdir of packer_cache in ESX5Driver.UploadISO

- Fix vmx path in ESX5Driver.IsRunning
This commit is contained in:
Doug MacEachern 2013-11-11 15:51:30 -08:00
parent 21bb0674f2
commit 9655be5582
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builder/vmware/driver_esx5.go
View File

@ -42,7 +42,7 @@ func (d *ESX5Driver) CreateDisk(diskPathLocal string, size string, typeId string
} }
func (d *ESX5Driver) IsRunning(vmxPathLocal string) (bool, error) { func (d *ESX5Driver) IsRunning(vmxPathLocal string) (bool, error) {
vmxPath := d.datastorePath(vmxPathLocal) vmxPath := filepath.Join(d.outputDir, filepath.Base(vmxPathLocal))
state, err := d.run(nil, "vim-cmd", "vmsvc/power.getstate", vmxPath) state, err := d.run(nil, "vim-cmd", "vmsvc/power.getstate", vmxPath)
if err != nil { if err != nil {
return false, err return false, err
@ -84,11 +84,11 @@ func (d *ESX5Driver) UploadISO(localPath string) (string, error) {
return "", err return "", err
} }
if err := d.mkdir(filepath.Dir(targetFile)); err != nil { finalPath := d.datastorePath(targetFile)
if err := d.mkdir(filepath.Dir(finalPath)); err != nil {
return "", err return "", err
} }
finalPath := d.datastorePath(targetFile)
if err := d.upload(finalPath, localPath); err != nil { if err := d.upload(finalPath, localPath); err != nil {
return "", err return "", err
} }