runtime: change rootless data storage default path
Closes:
Approved by: rhatdan
@@ -25,16 +25,15 @@ func GetRootlessStorageOpts() (storage.StoreOptions, error) {
opts.RunRoot = filepath.Join(libpod.GetRootlessRuntimeDir(), "run")
- dataDir := os.Getenv("XDG_DATA_DIR")
- if dataDir != "" {
- opts.GraphRoot = filepath.Join(dataDir, "containers", "storage")
- } else {
+ dataDir := os.Getenv("XDG_DATA_HOME")
+ if dataDir == "" {
home := os.Getenv("HOME")
if home == "" {
- return opts, fmt.Errorf("HOME not specified")
+ return opts, fmt.Errorf("neither XDG_DATA_HOME nor HOME was set non-empty")
}
- opts.GraphRoot = filepath.Join(home, ".containers", "storage")
+ dataDir = filepath.Join(home, ".local", "share")
}
+ opts.GraphRoot = filepath.Join(dataDir, "containers", "storage")
opts.GraphDriverName = "vfs"
return opts, nil
}
