rootful: unset XDG_RUNTIME_DIR

Depending how the user logs in to the root account, XDG_RUNTIME_DIR is set to /run/user/0 or it is unset. For conmon we already set it always to an empty string. The inconsistency is causing issues for the dnsname plugin. To fix it unset XDG_RUNTIME_DIR for the podman process. [NO TESTS NEEDED] Fixes #10806 Fixes #10745 Signed-off-by: Paul Holzinger <[email protected]>
containers · Aug 16, 2021 · 91e21be · 91e21be
1 parent 859ffb4
commit 91e21be
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/cmd/podman/registry/config.go b/cmd/podman/registry/config.go
@@ -89,7 +89,12 @@ func newPodmanConfig() {
 // use for the containers.conf configuration file.
 func setXdgDirs() error {
 	if !rootless.IsRootless() {
-		return nil
+		// 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")
 	}
 
 	// Setup XDG_RUNTIME_DIR