summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorPaul Holzinger <pholzing@redhat.com>2021-09-24 10:40:15 +0200
committerPaul Holzinger <pholzing@redhat.com>2021-09-24 10:57:40 +0200
commit1cf66f514f82a065f4a9cb2b28242d7fe2d2950f (patch)
tree154b61f9773e7f21b25124ccf3ef29f3c83462b9 /cmd/podman
parent800d594afa160353cc7134ef912bf82f266a122c (diff)
downloadpodman-1cf66f514f82a065f4a9cb2b28242d7fe2d2950f.tar.gz
podman-1cf66f514f82a065f4a9cb2b28242d7fe2d2950f.tar.bz2
podman-1cf66f514f82a065f4a9cb2b28242d7fe2d2950f.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.go7
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