diff options
Diffstat (limited to '')
| -rw-r--r-- | man/systemd-system.conf.xml | 55 |
1 files changed, 38 insertions, 17 deletions
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml index 3c06b65..ae5b61b 100644 --- a/man/systemd-system.conf.xml +++ b/man/systemd-system.conf.xml @@ -1,6 +1,6 @@ <?xml version='1.0'?> <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" - "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ + "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ <!ENTITY % entities SYSTEM "custom-entities.ent" > %entities; ]> @@ -28,12 +28,16 @@ <refsynopsisdiv> <para><filename>/etc/systemd/system.conf</filename>, + <filename>/run/systemd/system.conf</filename>, + <filename>/usr/lib/systemd/system.conf</filename>, <filename>/etc/systemd/system.conf.d/*.conf</filename>, <filename>/run/systemd/system.conf.d/*.conf</filename>, <filename>/usr/lib/systemd/system.conf.d/*.conf</filename></para> <para><filename>~/.config/systemd/user.conf</filename>, <filename>/etc/systemd/user.conf</filename>, + <filename>/run/systemd/user.conf</filename>, + <filename>/usr/lib/systemd/user.conf</filename>, <filename>/etc/systemd/user.conf.d/*.conf</filename>, <filename>/run/systemd/user.conf.d/*.conf</filename>, <filename>/usr/lib/systemd/user.conf.d/*.conf</filename></para> @@ -44,9 +48,10 @@ <para>When run as a system instance, <command>systemd</command> interprets the configuration file <filename>system.conf</filename> and the files in <filename>system.conf.d</filename> directories; when - run as a user instance, it interprets the configuration file <filename>user.conf</filename> (either in - the home directory of the user, or if not found, under <filename>/etc/systemd/</filename>) and the files - in <filename>user.conf.d</filename> directories. These configuration files contain a few settings + run as a user instance, it interprets the configuration file <filename>user.conf</filename> (in order of + priority, in the home directory of the user and under <filename>/etc/systemd/</filename>, + <filename>/run/systemd/</filename>, and <filename>/usr/lib/systemd/</filename>) and the files in + <filename>user.conf.d</filename> directories. These configuration files contain a few settings controlling basic manager operations.</para> <para>See @@ -73,7 +78,7 @@ <term><varname>DumpCore=yes</varname></term> <term><varname>CrashChangeVT=no</varname></term> <term><varname>CrashShell=no</varname></term> - <term><varname>CrashReboot=no</varname></term> + <term><varname>CrashAction=freeze</varname></term> <term><varname>ShowStatus=yes</varname></term> <term><varname>DefaultStandardOutput=journal</varname></term> <term><varname>DefaultStandardError=inherit</varname></term> @@ -290,6 +295,20 @@ </varlistentry> <varlistentry> + <term><varname>ProtectSystem=</varname></term> + + <listitem><para>Takes a boolean argument or the string <literal>auto</literal>. If set to true this + will remount <filename>/usr/</filename> read-only. If set to <literal>auto</literal> (the default) + and running in an initrd equivalent to true, otherwise false. This implements a restricted subset of + the per-unit setting of the same name, see + <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry> for + details: currently, the <literal>full</literal> or <literal>struct</literal> values are not + supported.</para> + + <xi:include href="version-info.xml" xpointer="v256"/></listitem> + </varlistentry> + + <varlistentry> <term><varname>SystemCallArchitectures=</varname></term> <listitem><para>Takes a space-separated list of architecture @@ -605,10 +624,12 @@ <term><varname>ReloadLimitIntervalSec=</varname></term> <term><varname>ReloadLimitBurst=</varname></term> - <listitem><para>Rate limiting for daemon-reload requests. Default to unset, and any number of daemon-reload - operations can be requested at any time. <varname>ReloadLimitIntervalSec=</varname> takes a value in seconds - to configure the rate limit window, and <varname>ReloadLimitBurst=</varname> takes a positive integer to - configure the maximum allowed number of reloads within the configured time window.</para> + <listitem><para>Rate limiting for daemon-reload and (since v256) daemon-reexec requests. The setting + applies to both operations, but the rate limits are tracked separately. Defaults to unset, and any + number of operations can be requested at any time. <varname>ReloadLimitIntervalSec=</varname> takes + a value in seconds to configure the rate limit window, and <varname>ReloadLimitBurst=</varname> + takes a positive integer to configure the maximum allowed number of operations within the configured + time window.</para> <xi:include href="version-info.xml" xpointer="v253"/></listitem> </varlistentry> @@ -714,14 +735,14 @@ <refsect1> <title>See Also</title> - <para> - <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, - <citerefentry><refentrytitle>systemd.directives</refentrytitle><manvolnum>7</manvolnum></citerefentry>, - <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>, - <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>, - <citerefentry project='man-pages'><refentrytitle>environ</refentrytitle><manvolnum>7</manvolnum></citerefentry>, - <citerefentry project='man-pages'><refentrytitle>capabilities</refentrytitle><manvolnum>7</manvolnum></citerefentry> - </para> + <para><simplelist type="inline"> + <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member> + <member><citerefentry><refentrytitle>systemd.directives</refentrytitle><manvolnum>7</manvolnum></citerefentry></member> + <member><citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry></member> + <member><citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry></member> + <member><citerefentry project='man-pages'><refentrytitle>environ</refentrytitle><manvolnum>7</manvolnum></citerefentry></member> + <member><citerefentry project='man-pages'><refentrytitle>capabilities</refentrytitle><manvolnum>7</manvolnum></citerefentry></member> + </simplelist></para> </refsect1> </refentry> |