diff options
| author | Matthew Heon <matthew.heon@gmail.com> | 2018-07-20 12:29:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-20 12:29:04 -0400 |
| commit | d433e5612409f9e2207b11b017b1101631a7971b (patch) | |
| tree | 7e198c5a0b9f07a1dc8537b5f172aee54563832a /cmd | |
| parent | ba1871dac033783ab0329c9b3c9113a34a90992f (diff) | |
| parent | d4f14be3a7aa7b5b884906d764db3214e51b3e67 (diff) | |
| download | podman-d433e5612409f9e2207b11b017b1101631a7971b.tar.gz podman-d433e5612409f9e2207b11b017b1101631a7971b.tar.bz2 podman-d433e5612409f9e2207b11b017b1101631a7971b.zip | |
Merge pull request #1099 from giuseppe/per-user-conf-files
rootless: allow to override configuration files
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/libpodruntime/runtime.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cmd/podman/libpodruntime/runtime.go b/cmd/podman/libpodruntime/runtime.go index 098864810..3216d288b 100644 --- a/cmd/podman/libpodruntime/runtime.go +++ b/cmd/podman/libpodruntime/runtime.go @@ -57,6 +57,11 @@ func GetDefaultStoreOptions() (storage.StoreOptions, error) { if err != nil { return storageOpts, err } + + storageConf := filepath.Join(os.Getenv("HOME"), ".config/containers/storage.conf") + if _, err := os.Stat(storageConf); err == nil { + storage.ReloadConfigurationFile(storageConf, &storageOpts) + } } return storageOpts, nil } |