diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-08-19 21:16:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-19 21:16:06 +0200 |
| commit | 890378e3f7fe93bd40322445e31c169fa03d8bf7 (patch) | |
| tree | 3ca16c20e44dd94d6716e903a493e04a9b3fcdb6 /libpod/runtime.go | |
| parent | 33906a4c4013bfe12f058526ad0e3b697d2ec033 (diff) | |
| parent | d27e71374e89b3c88b486f8a7015185c9fe13ea9 (diff) | |
| download | podman-890378e3f7fe93bd40322445e31c169fa03d8bf7.tar.gz podman-890378e3f7fe93bd40322445e31c169fa03d8bf7.tar.bz2 podman-890378e3f7fe93bd40322445e31c169fa03d8bf7.zip | |
Merge pull request #3760 from rhatdan/auth
Use GetRuntimeDir to setup auth.json for login
Diffstat (limited to 'libpod/runtime.go')
| -rw-r--r-- | libpod/runtime.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libpod/runtime.go b/libpod/runtime.go index 2fa8dd424..cbbf667db 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -369,7 +369,7 @@ func SetXdgDirs() error { if runtimeDir == "" { var err error - runtimeDir, err = util.GetRootlessRuntimeDir() + runtimeDir, err = util.GetRuntimeDir() if err != nil { return err } @@ -395,11 +395,11 @@ func getDefaultTmpDir() (string, error) { return "/var/run/libpod", nil } - rootlessRuntimeDir, err := util.GetRootlessRuntimeDir() + runtimeDir, err := util.GetRuntimeDir() if err != nil { return "", err } - libpodRuntimeDir := filepath.Join(rootlessRuntimeDir, "libpod") + libpodRuntimeDir := filepath.Join(runtimeDir, "libpod") if err := os.Mkdir(libpodRuntimeDir, 0700|os.ModeSticky); err != nil { if !os.IsExist(err) { |