Merge pull request #1146 from higebu/fix-esxi-driver-iso-upload-path

Fixes #1062, ESXi Driver supports PACKER_CACHE_DIR
This commit is contained in:
Mitchell Hashimoto 2014-05-09 19:56:28 -07:00
commit e9727df15e
1 changed files with 2 additions and 4 deletions

View File

@ -260,10 +260,8 @@ func (d *ESX5Driver) String() string {
} }
func (d *ESX5Driver) datastorePath(path string) string { func (d *ESX5Driver) datastorePath(path string) string {
if filepath.IsAbs(path) { baseDir := filepath.Base(filepath.Dir(path))
return filepath.Join("/vmfs/volumes", d.Datastore, strings.Replace(path, "/", "", 1)) return filepath.Join("/vmfs/volumes", d.Datastore, baseDir, filepath.Base(path))
}
return filepath.Join("/vmfs/volumes", d.Datastore, path)
} }
func (d *ESX5Driver) connect() error { func (d *ESX5Driver) connect() error {