runtime: change rootless data storage default path

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

Closes: #936
Approved by: rhatdan
This commit is contained in:
Giuseppe Scrivano
2018-06-26 19:11:29 +02:00
committed by Atomic Bot
parent 3306d3e120
commit 6f3208b599

View File

@ -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
}