Reset defaultConfigFile if defaultOverrideConfigFile exits.

Currently DefaultConfigFile does not report back the storage.conf file that is actually used if /etc/containers/storage.conf exists it should be reported back to the user. This issue was seen with Podman. Signed-off-by: Daniel J Walsh <[email protected]>
containers · Nov 30, 2021 · 0baf764 · 0baf764
1 parent f84b05e
commit 0baf764
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/types/options.go b/types/options.go
@@ -42,6 +42,10 @@ func init() {
 	defaultStoreOptions.GraphDriverName = ""
 
 	if _, err := os.Stat(defaultOverrideConfigFile); err == nil {
+		// The DefaultConfigFile(rootless) function returns the path
+		// of the used storage.conf file, by returning defaultConfigFile
+		// If override exists containers/storage uses it by default.
+		defaultConfigFile = defaultOverrideConfigFile
 		ReloadConfigurationFileIfNeeded(defaultOverrideConfigFile, &defaultStoreOptions)
 	} else {
 		if !os.IsNotExist(err) {