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

fix

This commit is contained in:
Megan Marsh 2018-10-19 13:46:55 -07:00
parent 1e4133cbf9
commit 18c5e8deb8
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builder/vmware/iso/driver_esx5.go
View File

@ -89,18 +89,13 @@ func (d *ESX5Driver) Stop(vmxPathLocal string) error {
func (d *ESX5Driver) Register(vmxPathLocal string) error {
vmxPath := filepath.ToSlash(filepath.Join(d.outputDir, filepath.Base(vmxPathLocal)))
log.Printf("DEBUGGING 6794 (1): upload path is: %s", vmxPath)
if err := d.upload(vmxPath, vmxPathLocal); err != nil {
log.Printf("DEBUGGING 6794 (2): upload errored: %s", err.Error())
return err
}
log.Printf("DEBUGGING 6794 (3): Upload succeeded")
r, err := d.run(nil, "vim-cmd", "solo/registervm", fmt.Sprintf("\"%s\"", vmxPath))
if err != nil {
log.Printf("DEBUGGING 6794 (4): VM registration errorred: %s", err.Error())
return err
}
log.Printf("DEBUGGING 6794 (5): Registration succeeded")
d.vmId = strings.TrimRight(r, "\n")
return nil
}
@ -590,7 +585,6 @@ func (d *ESX5Driver) mkdir(path string) error {
func (d *ESX5Driver) upload(dst, src string) error {
f, err := os.Open(src)
if err != nil {
log.Printf("DEBUGGING 6794 (6): unable to open src file for scp upload")
return err
}
defer f.Close()

4
communicator/ssh/communicator.go
View File

@ -563,8 +563,8 @@ func (c *comm) scpUploadSession(path string, input io.Reader, fi *os.FileInfo) e
// The target directory and file for talking the SCP protocol
target_dir := filepath.Dir(path)
target_file := filepath.Base(path)
log.Printf("DEBUGGING 6794 (7): target dir is %s", target_dir)
log.Printf("DEBUGGING 6794 (8): target file is %s", target_file)
// Escape spaces in remote directory
target_dir = strings.Replace(target_dir, " ", "\\ ", -1)
// On windows, filepath.Dir uses backslash separators (ie. "\tmp").
// This does not work when the target host is unix. Switch to forward slash