From ed326206f2b0ed80cdeddc63430bfbe60016c7df Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Tue, 19 Mar 2019 10:59:43 +0100 Subject: rootless: remove SkipStorageSetup() in the few places where we care about skipping the storage initialization, we can simply use the process effective UID, instead of relying on a global boolean flag. Signed-off-by: Giuseppe Scrivano --- libpod/runtime.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libpod') diff --git a/libpod/runtime.go b/libpod/runtime.go index 6e54de558..6fb325c51 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -742,7 +742,7 @@ func makeRuntime(runtime *Runtime) (err error) { // Set up containers/storage var store storage.Store - if rootless.SkipStorageSetup() { + if os.Geteuid() != 0 { logrus.Debug("Not configuring container store") } else { store, err = storage.GetStore(runtime.config.StorageConfig) -- cgit v1.2.3-54-g00ecf