diff options
| author | Lennart Poettering <lennart@poettering.net> | 2018-07-23 17:44:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-23 17:44:56 +0200 |
| commit | 1d2d351319d23b252f89f5e346eacdb205d93660 (patch) | |
| tree | 5ef67643440e85b6563ef53b17ba6435f298c74a /src/basic | |
| parent | 08540a9591efe105439be81fc43d6dc65b715978 (diff) | |
| parent | 677a72cd3efdfde9d544b2d1fe62f352d6d8472c (diff) | |
| download | systemd-1d2d351319d23b252f89f5e346eacdb205d93660.tar.gz systemd-1d2d351319d23b252f89f5e346eacdb205d93660.tar.bz2 systemd-1d2d351319d23b252f89f5e346eacdb205d93660.zip | |
Merge pull request #9658 from LukeShu/to-upstream/misc-cleanup
nspawn: Miscellaneous touch-up
Diffstat (limited to 'src/basic')
| -rw-r--r-- | src/basic/cgroup-util.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c index 038ece4b06..daa15dbfcb 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c @@ -2384,10 +2384,9 @@ int cg_kernel_controllers(Set **ret) { assert(ret); - /* 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). */ + /* Determines the full list of kernel-known controllers. Might include controllers we don't actually support + * and controllers that aren't currently accessible (because not mounted). This does not include "name=" + * pseudo-controllers. */ controllers = set_new(&string_hash_ops); if (!controllers) |