Merge pull request #2078 from rhatdan/config.file

Add the configuration file used to setup storage to podman info
This commit is contained in:
OpenShift Merge Robot
2019-01-07 14:27:19 -08:00
committed by GitHub
4 changed files with 15 additions and 3 deletions

View File

@@ -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) {