diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-01-07 14:27:19 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-07 14:27:19 -0800 |
| commit | faa24627bb19d67b0e7a681673deb58922a634c1 (patch) | |
| tree | c83c01e8c30592ca95e786baaa96f8ba65fe2199 /vendor | |
| parent | 628b14ada7e892391fe92e88ea1e471eb6767acb (diff) | |
| parent | b367855d5f87bffc980cbce28b35363a4e21ba7c (diff) | |
| download | podman-faa24627bb19d67b0e7a681673deb58922a634c1.tar.gz podman-faa24627bb19d67b0e7a681673deb58922a634c1.tar.bz2 podman-faa24627bb19d67b0e7a681673deb58922a634c1.zip | |
Merge pull request #2078 from rhatdan/config.file
Add the configuration file used to setup storage to podman info
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/github.com/containers/storage/store.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vendor/github.com/containers/storage/store.go b/vendor/github.com/containers/storage/store.go index a166799c6..5877c3b06 100644 --- a/vendor/github.com/containers/storage/store.go +++ b/vendor/github.com/containers/storage/store.go @@ -2992,7 +2992,8 @@ func copyStringInterfaceMap(m map[string]interface{}) map[string]interface{} { return ret } -const defaultConfigFile = "/etc/containers/storage.conf" +// DefaultConfigFile path to the system wide storage.conf file +const DefaultConfigFile = "/etc/containers/storage.conf" // ThinpoolOptionsConfig represents the "storage.options.thinpool" // TOML config table. @@ -3237,7 +3238,7 @@ func init() { DefaultStoreOptions.GraphRoot = "/var/lib/containers/storage" DefaultStoreOptions.GraphDriverName = "" - ReloadConfigurationFile(defaultConfigFile, &DefaultStoreOptions) + ReloadConfigurationFile(DefaultConfigFile, &DefaultStoreOptions) } func GetDefaultMountOptions() ([]string, error) { |