diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2015-01-05 19:03:08 -0500 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2015-01-16 00:56:58 -0500 |
| commit | 16bf8f4096a15468e612b6cd8f6d3e5fd59ef7da (patch) | |
| tree | 080780b9eb6288e1e554a93e64e5cf940ccc246b | |
| parent | f11dbe2f409c293a1565cfcebbbb703c73e897b3 (diff) | |
| download | systemd-16bf8f4096a15468e612b6cd8f6d3e5fd59ef7da.tar.gz | |
cgroup: memory limits on / are not supported
(cherry picked from commit 75399049653f2d5e22032da70cf96f20d7b4d9a6)
| -rw-r--r-- | src/core/cgroup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/cgroup.c b/src/core/cgroup.c index 5f3d9907b7..37db3d5289 100644 --- a/src/core/cgroup.c +++ b/src/core/cgroup.c @@ -382,7 +382,7 @@ void cgroup_context_apply(CGroupContext *c, CGroupControllerMask mask, const cha } } - if (mask & CGROUP_MEMORY) { + if ((mask & CGROUP_MEMORY) & !is_root) { if (c->memory_limit != (uint64_t) -1) { char buf[DECIMAL_STR_MAX(uint64_t) + 1]; |