diff options
Diffstat (limited to 'man/systemd-system.conf.xml')
| -rw-r--r-- | man/systemd-system.conf.xml | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml index 7c3f237567..5aa5da4706 100644 --- a/man/systemd-system.conf.xml +++ b/man/systemd-system.conf.xml @@ -1,6 +1,9 @@ <?xml version='1.0'?> <!--*-nxml-*--> <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" - "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ +<!ENTITY % entities SYSTEM "custom-entities.ent" > +%entities; +]> <!-- This file is part of systemd. @@ -51,14 +54,14 @@ </refnamediv> <refsynopsisdiv> - <para><filename>/etc/systemd/system.conf</filename></para> - <para><filename>/etc/systemd/system.conf.d/*.conf</filename></para> + <para><filename>&pkgsysconfdir;/system.conf</filename></para> + <para><filename>&pkgsysconfdir;/system.conf.d/*.conf</filename></para> <para><filename>/run/systemd/system.conf.d/*.conf</filename></para> - <para><filename>/usr/lib/systemd/system.conf.d/*.conf</filename></para> - <para><filename>/etc/systemd/user.conf</filename></para> - <para><filename>/etc/systemd/user.conf.d/*.conf</filename></para> + <para><filename>&rootlibexecdir;/system.conf.d/*.conf</filename></para> + <para><filename>&pkgsysconfdir;/user.conf</filename></para> + <para><filename>&pkgsysconfdir;/user.conf.d/*.conf</filename></para> <para><filename>/run/systemd/user.conf.d/*.conf</filename></para> - <para><filename>/usr/lib/systemd/user.conf.d/*.conf</filename></para> + <para><filename>&rootlibexecdir;/user.conf.d/*.conf</filename></para> </refsynopsisdiv> <refsect1> @@ -74,8 +77,7 @@ operations.</para> </refsect1> - <xi:include href="standard-conf.xml" xpointer="confd" /> - <xi:include href="standard-conf.xml" xpointer="conf" /> + <xi:include href="standard-conf.xml" xpointer="main-conf" /> <refsect1> <title>Options</title> @@ -173,7 +175,7 @@ <citerefentry project='man-pages'><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>. + <citerefentry project='mankier'><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 @@ -261,7 +263,11 @@ <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry> for details on the per-unit settings). For non-service units, <varname>DefaultTimeoutStartSec=</varname> sets the default - <varname>TimeoutSec=</varname> value. </para></listitem> + <varname>TimeoutSec=</varname> + value. <varname>DefaultTimeoutStartSec=</varname> and + <varname>DefaultTimeoutStopSec=</varname> default to + 90s. <varname>DefaultRestartSec=</varname> defaults to + 100ms.</para></listitem> </varlistentry> <varlistentry> @@ -273,7 +279,10 @@ <varname>StartLimitInterval=</varname> and <varname>StartLimitBurst=</varname>. See <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry> - for details on the per-service settings.</para></listitem> + for details on the per-service settings. + <varname>DefaultStartLimitInterval=</varname> defaults to + 10s. <varname>DefaultStartLimitBurst=</varname> defaults to + 5.</para></listitem> </varlistentry> <varlistentry> |