core: Set source for mountinfo .mount units

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

diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml
index d05a30bd48e41b254a3c74b9fb6b824dcc398d57..8c8fb7d7c04041592d888458d9ff69442dac8a30 100644 (file)
--- a/man/systemd.conf.xml
+++ b/man/systemd.conf.xml
@@ -44,12 +44,12 @@
 
         <refnamediv>
                 <refname>systemd.conf</refname>
 
         <refnamediv>
                 <refname>systemd.conf</refname>

-                <refpurpose>systemd manager configuration file</refpurpose>
+                <refpurpose>System and service manager configuration file</refpurpose>

         </refnamediv>
 
         <refsynopsisdiv>
         </refnamediv>
 
         <refsynopsisdiv>

-                <para><filename>system.conf</filename></para>
-                <para><filename>user.conf</filename></para>
+                <para><filename>/etc/systemd/system.conf</filename></para>
+                <para><filename>/etc/systemd/user.conf</filename></para>

         </refsynopsisdiv>
 
         <refsect1>
         </refsynopsisdiv>
 
         <refsect1>


@@ -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>


@@ -79,7 +79,6 @@
                                 <term><varname>DumpCore=yes</varname></term>
                                 <term><varname>CrashShell=no</varname></term>
                                 <term><varname>ShowStatus=yes</varname></term>
                                 <term><varname>DumpCore=yes</varname></term>
                                 <term><varname>CrashShell=no</varname></term>
                                 <term><varname>ShowStatus=yes</varname></term>

-                                <term><varname>SysVConsole=yes</varname></term>

                                 <term><varname>CrashChVT=1</varname></term>
                                 <term><varname>DefaultStandardOutput=journal</varname></term>
                                 <term><varname>DefaultStandardError=inherit</varname></term>
                                 <term><varname>CrashChVT=1</varname></term>
                                 <term><varname>DefaultStandardOutput=journal</varname></term>
                                 <term><varname>DefaultStandardError=inherit</varname></term>


@@ -103,18 +102,6 @@
                                 of CPU indexes.</para></listitem>
                         </varlistentry>
 
                                 of CPU indexes.</para></listitem>
                         </varlistentry>
 

-                        <varlistentry>
-                                <term><varname>MountAuto=yes</varname></term>
-                                <term><varname>SwapAuto=yes</varname></term>
-
-                                <listitem><para>Configures whether
-                                systemd should automatically activate
-                                all swap or mounts listed in
-                                <filename>/etc/fstab</filename>, or
-                                whether this job is left to some other
-                                system script.</para></listitem>
-                        </varlistentry>
-

                         <varlistentry>
                                 <term><varname>DefaultControllers=cpu</varname></term>
 
                         <varlistentry>
                                 <term><varname>DefaultControllers=cpu</varname></term>
 


@@ -127,18 +114,27 @@
                                 of controller names. Pass an empty
                                 string to ensure that systemd does not
                                 touch any hierarchies but its
                                 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>
                         </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
 
                                 <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
                                 those listed in this setting. Takes a
                                 space separated list of comma
                                 separated controller names, in order


@@ -147,7 +143,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 controller hierachies in a
+                                different configuration than intended,
+                                and the main system cannot remount
+                                them anymore.</para></listitem>

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


@@ -194,13 +203,104 @@
                                 effect if a hardware watchdog is not
                                 available.</para></listitem>
                         </varlistentry>
                                 effect if a hardware watchdog is not
                                 available.</para></listitem>
                         </varlistentry>

+
+                        <varlistentry>
+                                <term><varname>CapabilityBoundingSet=</varname></term>
+
+                                <listitem><para>Controls which
+                                capabilities to include in the
+                                capability bounding set for PID 1 and
+                                its children. See
+                                <citerefentry><refentrytitle>capabilities</refentrytitle><manvolnum>7</manvolnum></citerefentry>
+                                for details. Takes a whitespace
+                                separated list of capability names as
+                                read by
+                                <citerefentry><refentrytitle>cap_from_name</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
+                                Capabilities listed will be included
+                                in the bounding set, all others are
+                                removed. If the list of capabilities
+                                is prefixed with ~ all but the listed
+                                capabilities will be included, the
+                                effect of the assignment
+                                inverted. Note that this option also
+                                affects the respective capabilities in
+                                the effective, permitted and
+                                inheritable capability sets. The
+                                capability bounding set may also be
+                                individually configured for units
+                                using the
+                                <varname>CapabilityBoundingSet=</varname>
+                                directive for units, but note that
+                                capabilities dropped for PID 1 cannot
+                                be regained in individual units, they
+                                are lost for good.</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><varname>TimerSlackNSec=</varname></term>
+
+                                <listitem><para>Sets the timer slack
+                                in nanoseconds for PID 1 which is then
+                                inherited to all executed processes,
+                                unless overridden individually, for
+                                example with the
+                                <varname>TimerSlackNSec=</varname>
+                                setting in service units (for details
+                                see
+                                <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>). The
+                                timer slack controls the accuracy of
+                                wake-ups triggered by timers. See
+                                <citerefentry><refentrytitle>prctl</refentrytitle><manvolnum>2</manvolnum></citerefentry>
+                                for more information. Note that in
+                                contrast to most other time span
+                                definitions this parameter takes an
+                                integer value in nano-seconds if no
+                                unit is specified. The usual time
+                                units are understood
+                                too.</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><varname>DefaultLimitCPU=</varname></term>
+                                <term><varname>DefaultLimitFSIZE=</varname></term>
+                                <term><varname>DefaultLimitDATA=</varname></term>
+                                <term><varname>DefaultLimitSTACK=</varname></term>
+                                <term><varname>DefaultLimitCORE=</varname></term>
+                                <term><varname>DefaultLimitRSS=</varname></term>
+                                <term><varname>DefaultLimitNOFILE=</varname></term>
+                                <term><varname>DefaultLimitAS=</varname></term>
+                                <term><varname>DefaultLimitNPROC=</varname></term>
+                                <term><varname>DefaultLimitMEMLOCK=</varname></term>
+                                <term><varname>DefaultLimitLOCKS=</varname></term>
+                                <term><varname>DefaultLimitSIGPENDING=</varname></term>
+                                <term><varname>DefaultLimitMSGQUEUE=</varname></term>
+                                <term><varname>DefaultLimitNICE=</varname></term>
+                                <term><varname>DefaultLimitRTPRIO=</varname></term>
+                                <term><varname>DefaultLimitRTTIME=</varname></term>
+
+                                <listitem><para>These settings control
+                                various default resource limits for
+                                units. See
+                                <citerefentry><refentrytitle>setrlimit</refentrytitle><manvolnum>2</manvolnum></citerefentry>
+                                for details. Use the string
+                                <varname>infinity</varname> to
+                                configure no limit on a specific
+                                resource. These settings may be
+                                overridden in individual units
+                                using the corresponding LimitXXX=
+                                directives. Note that these resource
+                                limits are only defaults for units,
+                                they are not applied to PID 1
+                                itself.</para></listitem>
+                        </varlistentry>

                 </variablelist>
         </refsect1>
 
         <refsect1>
                   <title>See Also</title>
                   <para>
                 </variablelist>
         </refsect1>
 
         <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>