summaryrefslogtreecommitdiff
path: root/man/systemd.service.xml
diff options
context:
space:
mode:
Diffstat (limited to 'man/systemd.service.xml')
-rw-r--r--man/systemd.service.xml16
1 files changed, 12 insertions, 4 deletions
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index c03b4e8a54..0fe694ab7e 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.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.
@@ -334,6 +337,11 @@
<para>If any of those commands (not prefixed with
<literal>-</literal>) fail, the rest are not executed and the
unit is considered failed.</para>
+
+ <para>Note that <varname>ExecStartPre=</varname> may not be
+ used to start long-running processes. All processes forked
+ off by processes invoked via <varname>ExecStartPre=</varname> will
+ be killed before the next service process is run.</para>
</listitem>
</varlistentry>
@@ -508,7 +516,7 @@
<option>on-failure</option>, the service will be restarted
when the process exits with a non-zero exit code, is
terminated by a signal (including on core dump, but excluding
- the aforementiond four signals), when an operation (such as
+ the aforementioned four signals), when an operation (such as
service reload) times out, and when the configured watchdog
timeout is triggered. If set to <option>on-abnormal</option>,
the service will be restarted when the process is terminated
@@ -886,7 +894,7 @@
<title>Command lines</title>
<para>This section describes command line parsing and
- variable and specifier substitions for
+ variable and specifier substitutions for
<varname>ExecStart=</varname>,
<varname>ExecStartPre=</varname>,
<varname>ExecStartPost=</varname>,
@@ -1126,7 +1134,7 @@ WantedBy=multi-user.target</programlisting>
<varname>Type=</varname><option>oneshot</option> exists. Units
of this type will wait until the process specified terminates
and then fall back to being inactive. The following unit will
- perform a clenaup action:</para>
+ perform a cleanup action:</para>
<programlisting>[Unit]
Description=Cleanup old Foo data