Merge pull request #15323 from rhatdan/warn

Don't warn on '/' not being shared while in a container

1 files changed, 14 insertions, 12 deletions

diff --git a/pkg/rootless/rootless_linux.go b/pkg/rootless/rootless_linux.go
index b0012b32b..8c4316dbb 100644
--- a/pkg/rootless/rootless_linux.go
+++ b/pkg/rootless/rootless_linux.go
@@ -251,20 +251,22 @@ func becomeRootInUserNS(pausePid, fileToRead string, fileOutput *os.File) (_ boo
 		return false, 0, nil
 	}
 
-	if mounts, err := pmount.GetMounts(); err == nil {
-		for _, m := range mounts {
-			if m.Mountpoint == "/" {
-				isShared := false
-				for _, o := range strings.Split(m.Optional, ",") {
-					if strings.HasPrefix(o, "shared:") {
-						isShared = true
-						break
+	if _, inContainer := os.LookupEnv("container"); !inContainer {
+		if mounts, err := pmount.GetMounts(); err == nil {
+			for _, m := range mounts {
+				if m.Mountpoint == "/" {
+					isShared := false
+					for _, o := range strings.Split(m.Optional, ",") {
+						if strings.HasPrefix(o, "shared:") {
+							isShared = true
+							break
+						}
 					}
+					if !isShared {
+						logrus.Warningf("%q is not a shared mount, this could cause issues or missing mounts with rootless containers", m.Mountpoint)
+					}
+					break
 				}
-				if !isShared {
-					logrus.Warningf("%q is not a shared mount, this could cause issues or missing mounts with rootless containers", m.Mountpoint)
-				}
-				break
 			}
 		}
 	}