X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.conf.xml;h=8c8fb7d7c04041592d888458d9ff69442dac8a30;hb=aa7cb2098302d45c8768ca08bf1e433a19aa46b9;hp=fb038eaf6d9b65d7929e357926df0189ef455ca8;hpb=4aa6e7782a1b693a8e4fa1d84c87dd76fe1e536d;p=elogind.git

diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml
index fb038eaf6..8c8fb7d7c 100644
--- a/man/systemd.conf.xml
+++ b/man/systemd.conf.xml
@@ -44,7 +44,7 @@
 
         <refnamediv>
                 <refname>systemd.conf</refname>
-                <refpurpose>systemd manager configuration file</refpurpose>
+                <refpurpose>System and service manager configuration file</refpurpose>
         </refnamediv>
 
         <refsynopsisdiv>
@@ -69,7 +69,7 @@
                 <para>All options are configured in the
                 <literal>[Manager]</literal> section:</para>
 
-                <variablelist>
+                <variablelist class='systemd-directives'>
 
                         <varlistentry>
                                 <term><varname>LogLevel=</varname></term>
@@ -114,18 +114,27 @@
                                 of controller names. Pass an empty
                                 string to ensure that systemd does not
                                 touch any hierarchies but its
-                                own.</para></listitem>
+                                own.</para>
+
+                                <para>Note that the default value of
+                                'cpu' will make realtime scheduling
+                                unavailable to system services. See
+                                <ulink
+                                url="http://www.freedesktop.org/wiki/Software/systemd/MyServiceCantGetRealtime">My
+                                Service Can't Get Realtime!</ulink>
+                                for more
+                                information.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
-                                <term><varname>JoinControllers=cpu,cpuacct</varname></term>
+                                <term><varname>JoinControllers=cpu,cpuacct,cpuset net_cls,netprio</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
+                                hierarchies, with the exception of
                                 those listed in this setting. Takes a
                                 space separated list of comma
                                 separated controller names, in order
@@ -134,7 +143,20 @@
                                 'cpu,cpuacct'. Pass an empty string to
                                 ensure that systemd mounts all
                                 controllers in separate
-                                hierarchies.</para></listitem>
+                                hierarchies.</para>
+
+                                <para>Note that this option is only
+                                applied once, at very early boot. If
+                                you use an initial RAM disk (initrd)
+                                that uses systemd it might hence be
+                                necessary to rebuild the initrd if
+                                this option is changed, and make sure
+                                the new configuration file is included
+                                in it. Otherwise the initrd might
+                                mount the controller hierachies in a
+                                different configuration than intended,
+                                and the main system cannot remount
+                                them anymore.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
@@ -201,7 +223,7 @@
                                 capabilities will be included, the
                                 effect of the assignment
                                 inverted. Note that this option also
-                                effects the respective capabilities in
+                                affects the respective capabilities in
                                 the effective, permitted and
                                 inheritable capability sets. The
                                 capability bounding set may also be
@@ -220,7 +242,7 @@
                                 <listitem><para>Sets the timer slack
                                 in nanoseconds for PID 1 which is then
                                 inherited to all executed processes,
-                                unless overriden individually, for
+                                unless overridden individually, for
                                 example with the
                                 <varname>TimerSlackNSec=</varname>
                                 setting in service units (for details
@@ -264,7 +286,7 @@
                                 <varname>infinity</varname> to
                                 configure no limit on a specific
                                 resource. These settings may be
-                                overriden in individual units
+                                overridden in individual units
                                 using the corresponding LimitXXX=
                                 directives. Note that these resource
                                 limits are only defaults for units,
@@ -277,7 +299,8 @@
         <refsect1>
                   <title>See Also</title>
                   <para>
-                          <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                          <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                          <citerefentry><refentrytitle>systemd.directives</refentrytitle><manvolnum>7</manvolnum></citerefentry>
                   </para>
         </refsect1>