summaryrefslogtreecommitdiff
path: root/man/systemd.conf.xml
diff options
context:
space:
mode:
Diffstat (limited to 'man/systemd.conf.xml')
-rw-r--r--man/systemd.conf.xml20
1 files changed, 20 insertions, 0 deletions
diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml
index 8faedda6c2..56490ef442 100644
--- a/man/systemd.conf.xml
+++ b/man/systemd.conf.xml
@@ -129,6 +129,26 @@
touch any hierarchies but its
own.</para></listitem>
</varlistentry>
+
+ <varlistentry>
+ <term><varname>JoinControllers=cpu,cpuacct</varname></term>
+
+ <listitem><para>Configures controllers
+ that shall be mounted in a single
+ hierarchy. By default systemd will
+ mount all controllers which are
+ enabled in the kernel in individual
+ hierachies, with the exception of
+ those listed in this setting. Takes a
+ space separated list of comma
+ separated controller names, in order
+ to allow multiple joined
+ hierarchies. Defaults to
+ 'cpu,cpuacct'. Pass an empty string to
+ ensure that systemd mounts all
+ controllers in separate
+ hierarchies.</para></listitem>
+ </varlistentry>
</variablelist>
</refsect1>