chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d2dedf1
)
Prep v232.2: cg_update_unified() : Statically set 'unified_cache' to 'CGROUP_UNIFIED_...
author
Sven Eden
<yamakuzure@gmx.net>
Wed, 5 Jul 2017 12:24:33 +0000
(14:24 +0200)
committer
Sven Eden
<yamakuzure@gmx.net>
Wed, 5 Jul 2017 12:24:33 +0000
(14:24 +0200)
src/basic/cgroup-util.c
patch
|
blob
|
history
diff --git
a/src/basic/cgroup-util.c
b/src/basic/cgroup-util.c
index 9dd93d00b0a9d88e780e668c32bcc2b622627862..2c7ceb71d6893015215760691c76b1af6c0ad4cb 100644
(file)
--- 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)) {
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;
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;
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;
}
return 0;
}