summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2019-01-03 16:18:14 -0500
committerDaniel J Walsh <dwalsh@redhat.com>2019-01-03 16:25:02 -0500
commitb0fcd555db55fc8e739614f44c62f14cd608725d (patch)
tree849925d6211f7996404a69f1e501c50221e87029
parent098c13418abf3985f20689bdda0361904a40ef98 (diff)
downloadpodman-b0fcd555db55fc8e739614f44c62f14cd608725d.tar.gz
podman-b0fcd555db55fc8e739614f44c62f14cd608725d.tar.bz2
podman-b0fcd555db55fc8e739614f44c62f14cd608725d.zip
If local storage file exists, then use it rather then defaults.
Currently we always force overlay if it exists even though a user might want vfs. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
-rw-r--r--pkg/util/utils.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/pkg/util/utils.go b/pkg/util/utils.go
index a6f52cb3e..d327d152c 100644
--- a/pkg/util/utils.go
+++ b/pkg/util/utils.go
@@ -316,6 +316,7 @@ func GetDefaultStoreOptions() (storage.StoreOptions, string, error) {
storageConf := filepath.Join(os.Getenv("HOME"), ".config/containers/storage.conf")
if _, err := os.Stat(storageConf); err == nil {
+ storageOpts = storage.StoreOptions{}
storage.ReloadConfigurationFile(storageConf, &storageOpts)
} else if os.IsNotExist(err) {
os.MkdirAll(filepath.Dir(storageConf), 0755)