summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-11-28 12:25:53 +0100
committerGitHub <noreply@github.com>2020-11-28 12:25:53 +0100
commit3110308519c53679b342b166940a0605fea4bfc3 (patch)
tree05722355cb1262beb136ad62d07528d5fc1e0b6e
parentad2439264d401af0443be564ccc68169a8517db4 (diff)
parent3c6dca2f873b14c1b046db993580a90c2af323c8 (diff)
downloadpodman-3110308519c53679b342b166940a0605fea4bfc3.tar.gz
podman-3110308519c53679b342b166940a0605fea4bfc3.tar.bz2
podman-3110308519c53679b342b166940a0605fea4bfc3.zip
Merge pull request #8500 from giuseppe/set-xdg-dirs
runtime: set XDG_* env variables if missing
-rw-r--r--libpod/runtime.go4
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