From 4cc4c7137d29111fe6ccca526bc11d435fa20dd7 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Thu, 5 Jul 2018 12:03:28 +0200 Subject: rootless: add /run/user/$UID to the lookup paths when XDG_RUNTIME_DIR is not set, still attempt to use /run/user/$UID before looking up other directories. Signed-off-by: Giuseppe Scrivano Closes: #1048 Approved by: mheon --- libpod/runtime.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libpod/runtime.go b/libpod/runtime.go index 6f751f959..ce64f0d5b 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -178,8 +178,17 @@ var ( // GetRootlessRuntimeDir returns the runtime directory when running as non root func GetRootlessRuntimeDir() string { runtimeDir := os.Getenv("XDG_RUNTIME_DIR") + uid := fmt.Sprintf("%d", rootless.GetRootlessUID()) if runtimeDir == "" { - tmpDir := filepath.Join(os.TempDir(), "user", fmt.Sprintf("%d", os.Getuid())) + tmpDir := filepath.Join("/run", "user", uid) + os.MkdirAll(tmpDir, 0700) + st, err := os.Stat(tmpDir) + if err == nil && int(st.Sys().(*syscall.Stat_t).Uid) == os.Getuid() && st.Mode().Perm() == 0700 { + runtimeDir = tmpDir + } + } + if runtimeDir == "" { + tmpDir := filepath.Join(os.TempDir(), "user", uid) os.MkdirAll(tmpDir, 0700) st, err := os.Stat(tmpDir) if err == nil && int(st.Sys().(*syscall.Stat_t).Uid) == os.Getuid() && st.Mode().Perm() == 0700 { -- cgit v1.2.3-54-g00ecf