Locate lxc root directory when exporting as well.

This commit is contained in:
Omer Katz 2018-07-29 16:14:17 +03:00
parent e5b740e223
commit 26dd6441e0
No known key found for this signature in database
GPG Key ID: 12A53B890119D176
1 changed files with 12 additions and 1 deletions

View File

@ -4,7 +4,9 @@ import (
"context"
"fmt"
"io"
"log"
"os"
"os/user"
"path/filepath"
"github.com/hashicorp/packer/helper/multistep"
@ -19,7 +21,16 @@ func (s *stepExport) Run(_ context.Context, state multistep.StateBag) multistep.
name := config.ContainerName
containerDir := fmt.Sprintf("/var/lib/lxc/%s", name)
lxc_dir := "/var/lib/lxc"
user, err := user.Current()
if err != nil {
log.Print("Cannot find current user. Falling back to /var/lib/lxc...")
}
if user.Uid != "0" && user.HomeDir != "" {
lxc_dir = filepath.Join(user.HomeDir, ".local", "share", "lxc")
}
containerDir := filepath.Join(lxc_dir, name)
outputPath := filepath.Join(config.OutputDir, "rootfs.tar.gz")
configFilePath := filepath.Join(config.OutputDir, "lxc-config")