Merge pull request #1812 from giuseppe/rootless-once

rootless: call IsRootless just once

1 files changed, 10 insertions, 1 deletions

diff --git a/pkg/rootless/rootless_linux.go b/pkg/rootless/rootless_linux.go
index ff8c8fe34..85b0ef392 100644
--- a/pkg/rootless/rootless_linux.go
+++ b/pkg/rootless/rootless_linux.go
@@ -12,6 +12,7 @@ import (
 	"runtime"
 	"strconv"
 	"strings"
+	"sync"
 	"syscall"
 	"unsafe"
 
@@ -33,9 +34,17 @@ func runInUser() error {
 	return nil
 }
 
+var (
+	isRootlessOnce sync.Once
+	isRootless     bool
+)
+
 // IsRootless tells us if we are running in rootless mode
 func IsRootless() bool {
-	return os.Geteuid() != 0 || os.Getenv("_LIBPOD_USERNS_CONFIGURED") != ""
+	isRootlessOnce.Do(func() {
+		isRootless = os.Geteuid() != 0 || os.Getenv("_LIBPOD_USERNS_CONFIGURED") != ""
+	})
+	return isRootless
 }
 
 var (