diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-09-24 08:20:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-24 08:20:54 -0400 |
| commit | 9c48947c73b3bac33c18cb94aa6e1c4abc709cca (patch) | |
| tree | 5ce84552942b0914dc0cdfb923871d1e4907c34b /cmd/podman | |
| parent | 800d594afa160353cc7134ef912bf82f266a122c (diff) | |
| parent | 6095c4fac0ff275d01a969d1c48aace1ac673aea (diff) | |
| download | podman-9c48947c73b3bac33c18cb94aa6e1c4abc709cca.tar.gz podman-9c48947c73b3bac33c18cb94aa6e1c4abc709cca.tar.bz2 podman-9c48947c73b3bac33c18cb94aa6e1c4abc709cca.zip | |
Merge pull request #11733 from Luap99/xdg
rootful: do not set XDG_RUNTIME_DIR for cni plugins
Diffstat (limited to 'cmd/podman')
| -rw-r--r-- | cmd/podman/registry/config.go | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/cmd/podman/registry/config.go b/cmd/podman/registry/config.go index 50e488b02..b512ba341 100644 --- a/cmd/podman/registry/config.go +++ b/cmd/podman/registry/config.go @@ -89,12 +89,7 @@ func newPodmanConfig() { // use for the containers.conf configuration file. func setXdgDirs() error { if !rootless.IsRootless() { - // unset XDG_RUNTIME_DIR for root - // Sometimes XDG_RUNTIME_DIR is set to /run/user/0 sometimes it is unset, - // the inconsistency is causing issues for the dnsname plugin. - // It is already set to an empty string for conmon so lets do the same - // for podman. see #10806 and #10745 - return os.Unsetenv("XDG_RUNTIME_DIR") + return nil } // Setup XDG_RUNTIME_DIR |