Merge pull request #159 from mrunalp/rlimit_type

Change the rlimit type to string instead of int
opencontainers · Sep 9, 2015 · 931c6a9 · 931c6a9
2 parents fbac038 + d3a6069
commit 931c6a9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/runtime-config-linux.md b/runtime-config-linux.md
@@ -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
 

diff --git a/runtime_config_linux.go b/runtime_config_linux.go
@@ -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