jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/pr/159'

This commit is contained in:
Vincent Batts 2015-09-10 10:10:18 -04:00
parent 712a7467d1 d3a6069dc0
commit 3f62423765
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
runtime-config-linux.md
View File

@ -156,8 +156,8 @@ For more information, see [the man page](http://man7.org/linux/man-pages/man8/sy
```
rlimits allow setting resource limits.
The type is from the values defined in [the man page](http://man7.org/linux/man-pages/man2/setrlimit.2.html).
The kernel enforces the soft limit for a resource while the hard limit acts as a ceiling for that value that could be set by an unprivileged process.
`type` is a string with a value from those defined in [the man page](http://man7.org/linux/man-pages/man2/setrlimit.2.html).
The kernel enforces the `soft` limit for a resource while the `hard` limit acts as a ceiling for that value that could be set by an unprivileged process.
## SELinux process label

2
runtime_config_linux.go
View File

@ -79,7 +79,7 @@ type IDMapping struct {
// Rlimit type and restrictions
type Rlimit struct {
// Type of the rlimit to set
Type int `json:"type"`
Type string `json:"type"`
// Hard is the hard limit for the specified type
Hard uint64 `json:"hard"`
// Soft is the soft limit for the specified type