diff options
author | jortkoopmans <jort@jabo-solutions.eu> | 2020-11-30 15:58:23 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-30 15:58:23 +0100 |
commit | 84e8b2afa795ca060f4d2c5206f47d320292ed9b (patch) | |
tree | ea0e985d3f50d389b33fdb403d240e817251fd8c /libpod/runtime.go | |
parent | 5cfbe0b78e3672dd67cd028b85d816fc19d6a614 (diff) | |
parent | fc85ec942ee3273f5ad56381a0f6b9e78aea59bf (diff) | |
download | podman-84e8b2afa795ca060f4d2c5206f47d320292ed9b.tar.gz podman-84e8b2afa795ca060f4d2c5206f47d320292ed9b.tar.bz2 podman-84e8b2afa795ca060f4d2c5206f47d320292ed9b.zip |
Merge branch 'master' into patch-1
Diffstat (limited to 'libpod/runtime.go')
-rw-r--r-- | libpod/runtime.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libpod/runtime.go b/libpod/runtime.go index 792492db6..df3dfae2b 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -162,6 +162,10 @@ func newRuntimeFromConfig(ctx context.Context, conf *config.Config, options ...R runtime.config = conf + if err := SetXdgDirs(); err != nil { + return nil, err + } + storeOpts, err := storage.DefaultStoreOptions(rootless.IsRootless(), rootless.GetRootlessUID()) if err != nil { return nil, err |