From d8072baf33526092d0b94a0a1a3b8246a1a514e7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 15 Nov 2017 10:19:45 +0100 Subject: [PATCH] core: fix message about detected memory hierarchy Just the error check and message were wrong, otherwise the logic was OK. --- src/core/cgroup.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/cgroup.c b/src/core/cgroup.c index 656644828..413f18002 100644 --- a/src/core/cgroup.c +++ b/src/core/cgroup.c @@ -1991,9 +1991,9 @@ int manager_setup_cgroup(Manager *m) { return log_error_errno(r, "Couldn't determine if we are running in the unified hierarchy: %m"); all_unified = cg_all_unified(); - if (r < 0) - return log_error_errno(r, "Couldn't determine whether we are in all unified mode: %m"); - if (r > 0) + if (all_unified < 0) + return log_error_errno(all_unified, "Couldn't determine whether we are in all unified mode: %m"); + if (all_unified > 0) log_debug("Unified cgroup hierarchy is located at %s.", path); else { r = cg_unified_controller(SYSTEMD_CGROUP_CONTROLLER); -- 2.30.2