Merge pull request #147 from disconnect3d/patch-2

Fixes #146: cgroups_mem_max unit in config.proto
google · Jul 22, 2020 · 7de87ae · 7de87ae
2 parents f755488 + 5d103e5
commit 7de87ae
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/config.proto b/config.proto
@@ -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 */