From dc87440fa9ce11de578895cdf5326bb288cd78dc Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 10 Jun 2017 00:06:45 -0400 Subject: cgroup-util: Fix a comment about cg_kernel_controllers() behavior Remove ", arbitrary named hierarchies" from the list of things that cg_kernel_controllers() might return; /proc/cgroups does not contain "name=" pseudo-controllers (at least in any version of the kernel that I am aware of). If there are kernels out there that do put "name=" pseudo-controllers in /proc/cgroups, then the code that runs when SYSTEMD_NSPAWN_USE_CGNS=no is broken on these kernels. So there's precedent to ignoring these kernels, if they do exist. --- src/basic/cgroup-util.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c index 134e6e3664..cb38f0431d 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c @@ -2213,9 +2213,9 @@ int cg_kernel_controllers(Set *controllers) { assert(controllers); /* Determines the full list of kernel-known controllers. Might - * include controllers we don't actually support, arbitrary - * named hierarchies and controllers that aren't currently - * accessible (because not mounted). */ + * include controllers we don't actually support and + * controllers that aren't currently accessible (because not + * mounted). */ f = fopen("/proc/cgroups", "re"); if (!f) { -- cgit v1.2.3