From 57189f74cbd92893ca907278caebd3d2878e0fea Mon Sep 17 00:00:00 2001 From: Sven Eden Date: Wed, 5 Jul 2017 14:24:33 +0200 Subject: [PATCH] Prep v232.2: cg_update_unified() : Statically set 'unified_cache' to 'CGROUP_UNIFIED_NONE' --- src/basic/cgroup-util.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c index 9dd93d00b..2c7ceb71d 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c @@ -2333,14 +2333,6 @@ static int cg_update_unified(void) { if (F_TYPE_EQUAL(fs.f_type, CGROUP2_SUPER_MAGIC)) unified_cache = CGROUP_UNIFIED_ALL; else if (F_TYPE_EQUAL(fs.f_type, TMPFS_MAGIC)) { -#else - /* elogind can not support the unified hierarchy as a controller, - * so always assume a classical hierarchy. - * If, and only *if*, someone really wants to substitute systemd-login - * in an environment managed by systemd with elogind, we might have to - * add such a support. */ - if (F_TYPE_EQUAL(fs.f_type, TMPFS_MAGIC)) { -#endif // 0 if (statfs("/sys/fs/cgroup/systemd/", &fs) < 0) return -errno; @@ -2348,6 +2340,14 @@ static int cg_update_unified(void) { CGROUP_UNIFIED_SYSTEMD : CGROUP_UNIFIED_NONE; } else return -ENOMEDIUM; +#else + /* elogind can not support the unified hierarchy as a controller, + * so always assume a classical hierarchy. + * If, and only *if*, someone really wants to substitute systemd-login + * in an environment managed by systemd with elogind, we might have to + * add such a support. */ + unified_cache = CGROUP_UNIFIED_NONE; +#endif // 0 return 0; } -- 2.30.2