summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2018-07-16 11:28:59 +0200
committerGiuseppe Scrivano <gscrivan@redhat.com>2018-07-20 11:00:50 +0200
commit067ae3109516da042f0322d158ef1228bf7763bb (patch)
tree27c002c8029f1d9643c6dad2af975aa3a6b7129c /cmd
parentc17f8f664c0897918652d2b4b4a9bb0ba5b04cbf (diff)
downloadpodman-067ae3109516da042f0322d158ef1228bf7763bb.tar.gz
podman-067ae3109516da042f0322d158ef1228bf7763bb.tar.bz2
podman-067ae3109516da042f0322d158ef1228bf7763bb.zip
rootless: allow a per-user storage.conf file
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'cmd')
-rw-r--r--cmd/podman/libpodruntime/runtime.go5
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
}