From cc9ef4e61bbb062e9b903eea8bb973698904fe48 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 1 May 2019 18:49:04 +0200 Subject: container: drop rootless check we don't need to treat the rootless case differently now that we use a single user namespace. Signed-off-by: Giuseppe Scrivano --- libpod/container_internal.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libpod') diff --git a/libpod/container_internal.go b/libpod/container_internal.go index 927b71b2b..7febf6966 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -299,7 +299,7 @@ func (c *Container) setupStorage(ctx context.Context) error { return errors.Wrapf(err, "error creating container storage") } - if !rootless.IsRootless() && (len(c.config.IDMappings.UIDMap) != 0 || len(c.config.IDMappings.GIDMap) != 0) { + if len(c.config.IDMappings.UIDMap) != 0 || len(c.config.IDMappings.GIDMap) != 0 { if err := os.Chown(containerInfo.RunDir, c.RootUID(), c.RootGID()); err != nil { return err } -- cgit v1.2.3-54-g00ecf