From: Lennart Poettering Date: Thu, 14 May 2020 17:11:18 +0000 (+0200) Subject: limit-util: quieten a very common debug message that is misleading X-Git-Tag: v246-rc1~356^2~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7cd9e4f8a087caa38acb5c7b0c41d38e82cf4d80;p=thirdparty%2Fsystemd.git limit-util: quieten a very common debug message that is misleading --- diff --git a/src/basic/limits-util.c b/src/basic/limits-util.c index 43f6b6f68a9..9da767a5706 100644 --- a/src/basic/limits-util.c +++ b/src/basic/limits-util.c @@ -41,6 +41,11 @@ uint64_t physical_memory(void) { } if (r > 0) { r = cg_get_attribute("memory", root, "memory.max", &value); + if (r == -ENOENT) /* Field does not exist on the system's top-level cgroup, hence don't + * complain. (Note that it might exist on our own root though, if we live + * in a cgroup namespace, hence check anyway instead of not even + * trying.) */ + return mem; if (r < 0) { log_debug_errno(r, "Failed to read memory.max cgroup attribute, ignoring cgroup memory limit: %m"); return mem;