File 0001-cgroup-memory-limits-on-are-not-supported.... of Package systemd-mini.1472

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-cgroup-memory-limits-on-are-not-supported.patch of Package systemd-mini.1472

Based on 75399049653f2d5e22032da70cf96f20d7b4d9a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Mon, 5 Jan 2015 19:03:08 -0500
Subject: [PATCH] cgroup: memory limits on / are not supported

Includes a3bd89ea99214db7ca2ad6ae59181d5119a54f09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Sat, 31 Jan 2015 23:03:25 -0500
Subject: [PATCH] core/cgroup: fix embarrassing typo

https://github.com/docker/docker/issues/10280

---
 src/core/cgroup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git src/core/cgroup.c src/core/cgroup.c
index d6156c3..97f656e 100644
--- src/core/cgroup.c
+++ src/core/cgroup.c
@@ -380,7 +380,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];
 
-- 
2.2.0

Places

File 0001-cgroup-memory-limits-on-are-not-supported.patch of Package systemd-mini.1472

Places