units: add reference to new wiki page to all api mount units

[elogind.git] / man / systemd.conf.xml

diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml
index 7dc5cc13ce0f598c52b378eba9a6c35e1b4f9301..956db2c4d3a9f084c18b79fee1245893f9d82073 100644 (file)
--- a/man/systemd.conf.xml
+++ b/man/systemd.conf.xml
@@ -69,7 +69,7 @@
                 <para>All options are configured in the
                 <literal>[Manager]</literal> section:</para>
 
                 <para>All options are configured in the
                 <literal>[Manager]</literal> section:</para>
 

-                <variablelist>
+                <variablelist class='systemd-directives'>

 
                         <varlistentry>
                                 <term><varname>LogLevel=</varname></term>
 
                         <varlistentry>
                                 <term><varname>LogLevel=</varname></term>


@@ -118,7 +118,7 @@
                         </varlistentry>
 
                         <varlistentry>
                         </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
 
                                 <listitem><para>Configures controllers
                                 that shall be mounted in a single


@@ -134,7 +134,20 @@
                                 'cpu,cpuacct'. Pass an empty string to
                                 ensure that systemd mounts all
                                 controllers in separate
                                 '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 controllers in different
+                                configuration than intended, and the
+                                main system cannot remount them
+                                anymore.</para></listitem>

                         </varlistentry>
 
                         <varlistentry>
                         </varlistentry>
 
                         <varlistentry>


@@ -201,7 +214,7 @@
                                 capabilities will be included, the
                                 effect of the assignment
                                 inverted. Note that this option also
                                 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
                                 the effective, permitted and
                                 inheritable capability sets. The
                                 capability bounding set may also be


@@ -220,7 +233,7 @@
                                 <listitem><para>Sets the timer slack
                                 in nanoseconds for PID 1 which is then
                                 inherited to all executed processes,
                                 <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
                                 example with the
                                 <varname>TimerSlackNSec=</varname>
                                 setting in service units (for details


@@ -264,7 +277,7 @@
                                 <varname>infinity</varname> to
                                 configure no limit on a specific
                                 resource. These settings may be
                                 <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,
                                 using the corresponding LimitXXX=
                                 directives. Note that these resource
                                 limits are only defaults for units,


@@ -277,7 +290,8 @@
         <refsect1>
                   <title>See Also</title>
                   <para>
         <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>
 
                   </para>
         </refsect1>