Revert "rootful: unset XDG_RUNTIME_DIR"

This reverts commit 91e21be. XDG_RUNTIME_DIR is required for the authfile path. We cannot unset it. [NO TESTS NEEDED] Fixes containers#11725 Signed-off-by: Paul Holzinger <[email protected]>
Luap99 · Sep 24, 2021 · 1cf66f5 · 1cf66f5
1 parent 800d594
commit 1cf66f5
Showing 1 changed file with 1 addition and 6 deletions.
diff --git 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