diff options
| author | Paul Holzinger <pholzing@redhat.com> | 2021-09-24 10:40:15 +0200 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2021-09-29 16:39:29 -0400 |
| commit | 8c944274f902bbd439c79a8dc1ae586ad16a8bfe (patch) | |
| tree | 43d44d4070f0764b60f239e3dd04114b10853761 /cmd/podman | |
| parent | 6ef2d3bd8f1343dc9d47039b054046e7df91824c (diff) | |
| download | podman-8c944274f902bbd439c79a8dc1ae586ad16a8bfe.tar.gz podman-8c944274f902bbd439c79a8dc1ae586ad16a8bfe.tar.bz2 podman-8c944274f902bbd439c79a8dc1ae586ad16a8bfe.zip | |
Revert "rootful: unset XDG_RUNTIME_DIR"
This reverts commit 91e21bed48a2ab11049ef20e9150b5be531bc50a.
XDG_RUNTIME_DIR is required for the authfile path. We cannot unset it.
[NO TESTS NEEDED]
Fixes #11725
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
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 |