Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

If XDG_CONFIG_HOME env is set we should use it and ignore defaults #1357

Merged
merged 1 commit into from Sep 26, 2022

Conversation

rhatdan
Copy link
Member

@rhatdan rhatdan commented Sep 22, 2022

HPC Customers noticed that storage was attempting to read files in /usr and /etc, even though they set XDG_CONFIG_HOME, they expect to only read config files in this directory.

Fixes: containers/podman#15680

(Actually partial fixes), need to look at other config files.

Signed-off-by: Daniel J Walsh dwalsh@redhat.com

@rhatdan
Copy link
Member Author

rhatdan commented Sep 22, 2022

@vrothberg PTAL

@rhatdan
Copy link
Member Author

rhatdan commented Sep 23, 2022

types/options.go Outdated Show resolved Hide resolved
HPC Customers noticed that storage was attempting to read files in /usr
and /etc, even though they set XDG_CONFIG_HOME, they expect to only read
config files in this directory.

Fixes: containers/podman#15680

(Actually partial fixes), need to look at other config files.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Copy link
Member

@giuseppe giuseppe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Member

@vrothberg vrothberg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since I consider it to be a bug fix, LGTM :)

@vrothberg
Copy link
Member

Restarted the failed job.

@vrothberg
Copy link
Member

@rhatdan feel free to merge or rebase

@edsantiago
Copy link
Collaborator

This breaks podman.

rhatdan added a commit to rhatdan/storage that referenced this pull request Sep 26, 2022
Follow up to containers#1357

Podman tests suggest that do not need to use XDG_CONFIG_HOME if
storage.conf does not exists.  In that case we fall back to
/etc/containers/storage.conf and /usr/share/containers/storage.conf

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
rhatdan added a commit to rhatdan/storage that referenced this pull request Sep 26, 2022
Follow up to containers#1357

Podman tests suggest that do not need to use XDG_CONFIG_HOME if
storage.conf does not exists.  In that case we fall back to
/etc/containers/storage.conf and /usr/share/containers/storage.conf

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
rhatdan added a commit to rhatdan/storage that referenced this pull request Sep 26, 2022
Follow up to containers#1357

Podman tests suggest that do not need to use XDG_CONFIG_HOME if
storage.conf does not exists.  In that case we fall back to
/etc/containers/storage.conf and /usr/share/containers/storage.conf

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
rhatdan added a commit to rhatdan/storage that referenced this pull request Sep 27, 2022
Follow up to containers#1357

Podman tests suggest that do not need to use XDG_CONFIG_HOME if
storage.conf does not exists.  In that case we fall back to
/etc/containers/storage.conf and /usr/share/containers/storage.conf

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

podman opens storage.conf in locations other than XDG_CONFIG_HOME
5 participants