summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@gmail.com>2018-08-27 14:58:04 -0400
committerAtomic Bot <atomic-devel@projectatomic.io>2018-08-28 17:32:24 +0000
commitf86f5d3e59f2a319d8bfaaf5712dc90602f001a7 (patch)
treeff8709564f63cc0347952d344a93b7003005b49a
parent9da94c454fc6d1e2e6ce41f0bc177b9711ccc66b (diff)
downloadpodman-f86f5d3e59f2a319d8bfaaf5712dc90602f001a7.tar.gz
podman-f86f5d3e59f2a319d8bfaaf5712dc90602f001a7.tar.bz2
podman-f86f5d3e59f2a319d8bfaaf5712dc90602f001a7.zip
Do not set max open files by default if we are rootless
Signed-off-by: Matthew Heon <matthew.heon@gmail.com> Closes: #1355 Approved by: rhatdan
-rw-r--r--pkg/spec/spec.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/spec/spec.go b/pkg/spec/spec.go
index a2fa169e5..6520940d0 100644
--- a/pkg/spec/spec.go
+++ b/pkg/spec/spec.go
@@ -458,7 +458,7 @@ func addRlimits(config *CreateConfig, g *generate.Generator) error {
g.AddProcessRlimits("RLIMIT_"+strings.ToUpper(ul.Name), uint64(ul.Hard), uint64(ul.Soft))
}
- if !nofileSet {
+ if !nofileSet && !rootless.IsRootless() {
g.AddProcessRlimits("RLIMIT_NOFILE", 1048576, 1048576)
}