X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.conf.xml;h=ba144da8cf89b3f55de6779c99b3d14b5d41ac63;hb=f8045772bd4e555a486fc9f440c80c9fad006fb7;hp=8faedda6c297a3abbcab128c9779438ae0f76d3a;hpb=0a494f1ff323ef36b7acc637c198fdfa240c2bb2;p=elogind.git

diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml
index 8faedda6c..ba144da8c 100644
--- a/man/systemd.conf.xml
+++ b/man/systemd.conf.xml
@@ -81,7 +81,7 @@
                                 <term><varname>ShowStatus=yes</varname></term>
                                 <term><varname>SysVConsole=yes</varname></term>
                                 <term><varname>CrashChVT=1</varname></term>
-                                <term><varname>DefaultStandardOutput=null</varname></term>
+                                <term><varname>DefaultStandardOutput=journal</varname></term>
                                 <term><varname>DefaultStandardError=inherit</varname></term>
 
                                 <listitem><para>Configures various
@@ -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>