From 1cf66f514f82a065f4a9cb2b28242d7fe2d2950f Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Fri, 24 Sep 2021 10:40:15 +0200 Subject: 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 --- cmd/podman/registry/config.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'cmd/podman') 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 -- cgit v1.2.3-54-g00ecf