summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2019-09-13 17:12:59 +0900
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-09-13 15:06:40 +0200
commitbd9014c360f86aefcf4d417d50372a5fc29af7ce (patch)
treee3aae88849f4e7253ab05102fe748f21d194434b
parent4f6c7276372a458e81402ba38bfae2e3ba3f1154 (diff)
downloadsystemd-bd9014c360f86aefcf4d417d50372a5fc29af7ce.tar.gz
systemd-bd9014c360f86aefcf4d417d50372a5fc29af7ce.tar.bz2
systemd-bd9014c360f86aefcf4d417d50372a5fc29af7ce.zip
man: move TimeoutCleanSec= entry from .service to .exec
Follow-up for 12213aed128456af33ff6131a14b637318227346. Closes #13546.
-rw-r--r--man/systemd.exec.xml10
-rw-r--r--man/systemd.service.xml10
2 files changed, 10 insertions, 10 deletions
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index 5cb83afa57..6dcccc38b4 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -1036,6 +1036,16 @@ StateDirectory=aaa/bbb ccc</programlisting>
</varlistentry>
<varlistentry>
+ <term><varname>TimeoutCleanSec=</varname></term>
+ <listitem><para>Configures a timeout on the clean-up operation requested through <command>systemctl
+ clean …</command>, see
+ <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry> for
+ details. Takes the usual time values and defaults to <constant>infinity</constant>, i.e. by default
+ no time-out is applied. If a time-out is configured the clean operation will be aborted forcibly when
+ the time-out is reached, potentially leaving resources on disk.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><varname>ReadWritePaths=</varname></term>
<term><varname>ReadOnlyPaths=</varname></term>
<term><varname>InaccessiblePaths=</varname></term>
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 40ac052ba5..14840c2e16 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -637,16 +637,6 @@
</varlistentry>
<varlistentry>
- <term><varname>TimeoutCleanSec=</varname></term>
- <listitem><para>Configures a timeout on the clean-up operation requested through <command>systemctl
- clean …</command>, see
- <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry> for
- details. Takes the usual time values and defaults to <constant>infinity</constant>, i.e. by default
- no time-out is applied. If a time-out is configured the clean operation will be aborted forcibly when
- the time-out is reached, potentially leaving resources on disk.</para></listitem>
- </varlistentry>
-
- <varlistentry>
<term><varname>RuntimeMaxSec=</varname></term>
<listitem><para>Configures a maximum time for the service to run. If this is used and the service has been