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

Merge pull request #8636 from hashicorp/clundquist/fix-lxd-dir-upload 

fixes and closes #8547
This commit is contained in:
Chris Lundquist 2020-01-27 19:22:49 -08:00 committed by GitHub
parent 25a61d977d 15cbe4769c
commit 56206aa3ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builder/lxd/communicator.go
View File

@ -88,10 +88,12 @@ func (c *Communicator) Upload(dst string, r io.Reader, fi *os.FileInfo) error {
}
func (c *Communicator) UploadDir(dst string, src string, exclude []string) error {
fileDestination := filepath.Join(c.ContainerName, dst)
cp, err := c.CmdWrapper(fmt.Sprintf("lxc file push -pr %s %s", src, fileDestination))
fileDestination := fmt.Sprintf("%s/%s", c.ContainerName, dst)
pushCommand := fmt.Sprintf("lxc file push --debug -pr %s %s", src, fileDestination)
log.Printf(pushCommand)
cp, err := c.CmdWrapper(pushCommand)
if err != nil {
log.Printf("Error running cp command: %s", err)
return err
}