summaryrefslogtreecommitdiff
path: root/libpod
diff options
context:
space:
mode:
authorGiuseppe Scrivano <giuseppe@scrivano.org>2019-05-01 18:49:04 +0200
committerGiuseppe Scrivano <giuseppe@scrivano.org>2019-05-01 18:49:08 +0200
commitcc9ef4e61bbb062e9b903eea8bb973698904fe48 (patch)
tree408f48a09c9c6856b01b1ed749debc8509efb027 /libpod
parenteea77b5ae3e7fb8a60d438a79d3a4b30d35bb67c (diff)
downloadpodman-cc9ef4e61bbb062e9b903eea8bb973698904fe48.tar.gz
podman-cc9ef4e61bbb062e9b903eea8bb973698904fe48.tar.bz2
podman-cc9ef4e61bbb062e9b903eea8bb973698904fe48.zip
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 <giuseppe@scrivano.org>
Diffstat (limited to 'libpod')
-rw-r--r--libpod/container_internal.go2
1 files changed, 1 insertions, 1 deletions
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
}