diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-01-08 05:55:40 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-08 05:55:40 -0800 |
| commit | 4f19f1afcaa67f8e775e303b1b6627fb5abd9116 (patch) | |
| tree | 949f8022a442f9528dd18ba98cb9e757faedf3df /pkg/util | |
| parent | 1ebed882836d78db79a6b1d2f175208d58f39bef (diff) | |
| parent | b0fcd555db55fc8e739614f44c62f14cd608725d (diff) | |
| download | podman-4f19f1afcaa67f8e775e303b1b6627fb5abd9116.tar.gz podman-4f19f1afcaa67f8e775e303b1b6627fb5abd9116.tar.bz2 podman-4f19f1afcaa67f8e775e303b1b6627fb5abd9116.zip | |
Merge pull request #2076 from rhatdan/storage.conf
If local storage file exists, then use it rather then defau…
Diffstat (limited to 'pkg/util')
| -rw-r--r-- | pkg/util/utils.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkg/util/utils.go b/pkg/util/utils.go index 20ba20a52..2b752afe1 100644 --- a/pkg/util/utils.go +++ b/pkg/util/utils.go @@ -316,6 +316,7 @@ func GetDefaultStoreOptions() (storage.StoreOptions, string, error) { storageConf := StorageConfigFile() 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) |