Merge pull request #1357 from rhatdan/config

If XDG_CONFIG_HOME env is set we should use it and ignore defaults
containers · Sep 26, 2022 · c796944 · c796944
2 parents c79b492 + 9415b88
commit c796944
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/types/options.go b/types/options.go
@@ -48,6 +48,12 @@ func loadDefaultStoreOptions() {
 			loadDefaultStoreOptionsErr = err
 			return
 		}
+	} else if path, ok := os.LookupEnv("XDG_CONFIG_HOME"); ok {
+		defaultOverrideConfigFile = filepath.Join(path, "containers", "storage.conf")
+		if err := ReloadConfigurationFileIfNeeded(defaultOverrideConfigFile, &defaultStoreOptions); err != nil {
+			loadDefaultStoreOptionsErr = err
+			return
+		}
 	} else if _, err := os.Stat(defaultOverrideConfigFile); err == nil {
 		// The DefaultConfigFile(rootless) function returns the path
 		// of the used storage.conf file, by returning defaultConfigFile