diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2019-01-07 10:01:44 -0500 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2019-01-07 10:02:26 -0500 |
| commit | b367855d5f87bffc980cbce28b35363a4e21ba7c (patch) | |
| tree | 3d0c1427903b2b4f2a3afa1fcb418b03d749cc48 /vendor/github.com | |
| parent | a219431a317a2b6d9647ce81b7c845345e51b7da (diff) | |
| download | podman-b367855d5f87bffc980cbce28b35363a4e21ba7c.tar.gz podman-b367855d5f87bffc980cbce28b35363a4e21ba7c.tar.bz2 podman-b367855d5f87bffc980cbce28b35363a4e21ba7c.zip | |
Add the configuration file used to setup storage to podman info
Users have no idea what storage configuration file is used to setup
storage, so adding this to podman info, should make it easier to
discover.
This requires a revendor of containers/storage
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'vendor/github.com')
| -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) { |