diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-05-01 20:20:12 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-01 20:20:12 +0200 |
commit | 7d05ff3fc772a7be4860ed4a3cd59a62f8bb893a (patch) | |
tree | f9c0bb6cda007382eac329cb7e96ad27d8020ee4 | |
parent | ad68036a88e35dc3c7a19962b8e21867b459f8f1 (diff) | |
parent | cc9ef4e61bbb062e9b903eea8bb973698904fe48 (diff) | |
download | podman-7d05ff3fc772a7be4860ed4a3cd59a62f8bb893a.tar.gz podman-7d05ff3fc772a7be4860ed4a3cd59a62f8bb893a.tar.bz2 podman-7d05ff3fc772a7be4860ed4a3cd59a62f8bb893a.zip |
Merge pull request #3049 from giuseppe/drop-unuseful-check
container: drop rootless check
-rw-r--r-- | libpod/container_internal.go | 2 |
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 } |