core: add a setting to globally control the default for timer unit accuracy

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

diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index c33e010e36e00afb3efc33949c4ad5565b9dc2bc..e2b2bd8b6f75846c01e405d5bb5aff330efbe3d0 100644 (file)
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -99,7 +99,7 @@
                                 <listitem><para>Configures the initial
                                 CPU affinity for the init
                                 process. Takes a space-separated list
                                 <listitem><para>Configures the initial
                                 CPU affinity for the init
                                 process. Takes a space-separated list

-                                of CPU indexes.</para></listitem>
+                                of CPU indices.</para></listitem>

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


@@ -216,21 +216,21 @@
 
                                 <listitem><para>Takes a
                                 space-separated list of architecture
 
                                 <listitem><para>Takes a
                                 space-separated list of architecture

-                                identifiers. Selects of which
+                                identifiers. Selects from which

                                 architectures system calls may be
                                 invoked on this system. This may be
                                 used as an effective way to disable
                                 invocation of non-native binaries
                                 system-wide, for example to prohibit
                                 architectures system calls may be
                                 invoked on this system. This may be
                                 used as an effective way to disable
                                 invocation of non-native binaries
                                 system-wide, for example to prohibit

-                                execution of 32bit x86 binaries on
-                                64bit x86-64 systems. This option
-                                operates system wide, and acts
+                                execution of 32-bit x86 binaries on
+                                64-bit x86-64 systems. This option
+                                operates system-wide, and acts

                                 similar to the
                                 <varname>SystemCallArchitectures=</varname>
                                 setting of unit files, see
                                 <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>
                                 for details. This setting defaults to
                                 similar to the
                                 <varname>SystemCallArchitectures=</varname>
                                 setting of unit files, see
                                 <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>
                                 for details. This setting defaults to

-                                the empty list in which case no
+                                the empty list, in which case no

                                 filtering of system calls based on
                                 architecture is applied. Known
                                 architecture identifiers are
                                 filtering of system calls based on
                                 architecture is applied. Known
                                 architecture identifiers are


@@ -249,7 +249,7 @@
                                 execution of any non-native
                                 binaries. When a binary executes a
                                 system call of an architecture that is
                                 execution of any non-native
                                 binaries. When a binary executes a
                                 system call of an architecture that is

-                                not listed in this setting it will be
+                                not listed in this setting, it will be

                                 immediately terminated with the SIGSYS
                                 signal.</para></listitem>
                         </varlistentry>
                                 immediately terminated with the SIGSYS
                                 signal.</para></listitem>
                         </varlistentry>


@@ -259,8 +259,8 @@
                                 <term><varname>TimerSlackNSec=</varname></term>
 
                                 <listitem><para>Sets the timer slack
                                 <term><varname>TimerSlackNSec=</varname></term>
 
                                 <listitem><para>Sets the timer slack

-                                in nanoseconds for PID 1 which is then
-                                inherited to all executed processes,
+                                in nanoseconds for PID 1, which is
+                                inherited by all executed processes,

                                 unless overridden individually, for
                                 example with the
                                 <varname>TimerSlackNSec=</varname>
                                 unless overridden individually, for
                                 example with the
                                 <varname>TimerSlackNSec=</varname>


@@ -268,7 +268,8 @@
                                 see
                                 <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>). The
                                 timer slack controls the accuracy of
                                 see
                                 <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>). The
                                 timer slack controls the accuracy of

-                                wake-ups triggered by timers. See
+                                wake-ups triggered by system
+                                timers. See

                                 <citerefentry><refentrytitle>prctl</refentrytitle><manvolnum>2</manvolnum></citerefentry>
                                 for more information. Note that in
                                 contrast to most other time span
                                 <citerefentry><refentrytitle>prctl</refentrytitle><manvolnum>2</manvolnum></citerefentry>
                                 for more information. Note that in
                                 contrast to most other time span


@@ -279,20 +280,41 @@
                                 too.</para></listitem>
                         </varlistentry>
 
                                 too.</para></listitem>
                         </varlistentry>
 

+                        <varlistentry>
+                                <term><varname>DefaultTimerAccuracySec=</varname></term>
+
+                                <listitem><para>Sets the default
+                                accuracy of timer units. This controls
+                                the global default for the
+                                <varname>AccuracySec=</varname>
+                                setting of timer units, see
+                                <citerefentry><refentrytitle>systemd.timer</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+                                for
+                                details. <varname>AccuracySec=</varname>
+                                set in individual units override the
+                                global default for the specific
+                                unit. Defaults to 1min. Note that the
+                                accuracy of timer units is also
+                                affected by the configured timer slack
+                                for PID 1, see
+                                <varname>TimerSlackNSec=</varname>
+                                above.</para></listitem>
+                        </varlistentry>
+

                         <varlistentry>
                                 <term><varname>DefaultTimeoutStartSec=</varname></term>
                                 <term><varname>DefaultTimeoutStopSec=</varname></term>
                                 <term><varname>DefaultRestartSec=</varname></term>
 
                                 <listitem><para>Configures the default
                         <varlistentry>
                                 <term><varname>DefaultTimeoutStartSec=</varname></term>
                                 <term><varname>DefaultTimeoutStopSec=</varname></term>
                                 <term><varname>DefaultRestartSec=</varname></term>
 
                                 <listitem><para>Configures the default

-                                time-outs for starting and stopping of
+                                timeouts for starting and stopping of

                                 units, as well as the default time to
                                 sleep between automatic restarts of
                                 units, as configured per-unit in
                                 <varname>TimeoutStartSec=</varname>,
                                 <varname>TimeoutStopSec=</varname> and
                                 <varname>RestartSec=</varname> (for
                                 units, as well as the default time to
                                 sleep between automatic restarts of
                                 units, as configured per-unit in
                                 <varname>TimeoutStartSec=</varname>,
                                 <varname>TimeoutStopSec=</varname> and
                                 <varname>RestartSec=</varname> (for

-                                service units, see
+                                services, see

                                 <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
                                 for details on the per-unit
                                 settings). For non-service units,
                                 <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
                                 for details on the per-unit
                                 settings). For non-service units,


@@ -301,18 +323,20 @@
                                 <varname>TimeoutSec=</varname> value.
                                 </para></listitem>
                         </varlistentry>
                                 <varname>TimeoutSec=</varname> value.
                                 </para></listitem>
                         </varlistentry>

+

                         <varlistentry>
                                 <term><varname>DefaultStartLimitInterval=</varname></term>
                                 <term><varname>DefaultStartLimitBurst=</varname></term>
 
                         <varlistentry>
                                 <term><varname>DefaultStartLimitInterval=</varname></term>
                                 <term><varname>DefaultStartLimitBurst=</varname></term>
 

-                                <listitem><para>Configure the default start rate
-                                limiting, as configured per-service by
-                                <varname>StartLimitInterval=</varname> and
+                                <listitem><para>Configure the default
+                                unit start rate limiting, as
+                                configured per-service by
+                                <varname>StartLimitInterval=</varname>
+                                and

                                 <varname>StartLimitBurst=</varname>. See
                                 <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
                                 for details on the per-service
                                 <varname>StartLimitBurst=</varname>. See
                                 <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
                                 for details on the per-service

-                                settings).
-                                </para></listitem>
+                                settings.</para></listitem>

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


@@ -337,6 +361,23 @@
                                 <literal>VAR3</literal>.</para></listitem>
                         </varlistentry>
 
                                 <literal>VAR3</literal>.</para></listitem>
                         </varlistentry>
 

+                        <varlistentry>
+                                <term><varname>DefaultCPUAccounting=</varname></term>
+                                <term><varname>DefaultBlockIOAccounting=</varname></term>
+                                <term><varname>DefaultMemoryAccounting=</varname></term>
+
+                                <listitem><para>Configure the default
+                                resource accounting settings, as
+                                configured per-unit by
+                                <varname>CPUAccounting=</varname>,
+                                <varname>BlockIOAccounting=</varname>
+                                and
+                                <varname>MemoryAccounting=</varname>. See
+                                <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+                                for details on the per-unit
+                                settings.</para></listitem>
+                        </varlistentry>
+

                         <varlistentry>
                                 <term><varname>DefaultLimitCPU=</varname></term>
                                 <term><varname>DefaultLimitFSIZE=</varname></term>
                         <varlistentry>
                                 <term><varname>DefaultLimitCPU=</varname></term>
                                 <term><varname>DefaultLimitFSIZE=</varname></term>