Merge pull request #147 from disconnect3d/patch-2

Fixes #146: cgroups_mem_max unit in config.proto
This commit is contained in:
robertswiecki 2020-07-23 00:09:23 +02:00 committed by GitHub
commit 7de87aeb7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -196,7 +196,7 @@ message NsJailConfig {
optional bool seccomp_log = 60 [default = false];
/* If > 0, maximum cumulative size of RAM used inside any jail */
optional uint64 cgroup_mem_max = 61 [default = 0]; /* In MiB */
optional uint64 cgroup_mem_max = 61 [default = 0]; /* In bytes */
/* Mount point for cgroups-memory in your system */
optional string cgroup_mem_mount = 62 [default = "/sys/fs/cgroup/memory"];
/* Writeable directory (for the nsjail user) under cgroup_mem_mount */