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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 1 commit into from
Sep 26, 2022
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions types/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@ func loadDefaultStoreOptions() {
loadDefaultStoreOptionsErr = err
return
}
} else if path, ok := os.LookupEnv("XDG_CONFIG_HOME"); ok {
defaultOverrideConfigFile = filepath.Join(path, "containers", "storage.conf")
if err := ReloadConfigurationFileIfNeeded(defaultOverrideConfigFile, &defaultStoreOptions); err != nil {
loadDefaultStoreOptionsErr = err
return
}
} else if _, err := os.Stat(defaultOverrideConfigFile); err == nil {
// The DefaultConfigFile(rootless) function returns the path
// of the used storage.conf file, by returning defaultConfigFile
Expand Down