Skip to content

Commit

Permalink
Merge pull request #11195 from Luap99/xdg-root
Browse files Browse the repository at this point in the history
rootful: unset XDG_RUNTIME_DIR
  • Loading branch information
openshift-ci[bot] authored Aug 16, 2021
2 parents 9ee9d4a + 91e21be commit 41fb06a
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion cmd/podman/registry/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 41fb06a

Please sign in to comment.