Merge pull request #1080 from rhatdan/storage.conf

Reset defaultConfigFile if defaultOverrideConfigFile exits.
containers · Nov 30, 2021 · 1a158c8 · 1a158c8
2 parents f84b05e + 0baf764
commit 1a158c8
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) {