X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.service.xml;h=ee4d3937565b97c6f35649170212f6f8c2ab56f8;hp=2db146b719daf9407fe96bc88f0eaf6681cad502;hb=4bc5f808e4c4891451b83abbc85c4830b3788782;hpb=2ba545f1a098fc5621d4d1f1049af2f40793819a
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 2db146b71..ee4d39375 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -271,11 +271,11 @@
- an exit code of
the command normally considered a
failure (i.e. non-zero exit status or
- abormal exit due to signal) is ignored
+ abnormal exit due to signal) is ignored
and considered success. If both
- and
@ are used for the
- same command the former must preceed
+ same command the former must precede
the latter. Unless
Type=forking is
set, the process started via this
@@ -314,7 +314,7 @@
after the other,
serially. Alternatively, these
directives may be specified more than
- once whith the same effect. However,
+ once with the same effect. However,
the latter syntax is not recommended
for compatibility with parsers
suitable for XDG
@@ -427,7 +427,7 @@
Restart=Configures whether the
main service process shall be
- restarted when it exists. Takes one of
+ restarted when it exits. Takes one of
,
,
,
@@ -441,7 +441,7 @@
i.e. terminated with an exit code of
0. If set to
it will be
- restared only when it exited with an
+ restarted only when it exited with an
exit code not equalling 0, or when
terminated by a signal. If set to
it will be
@@ -557,20 +557,44 @@
group and the control group continues
to exist after stop unless it is
empty. Defaults to
- .
+ .
Processes will first be
- terminated via SIGTERM. If then after
- a delay (configured via the
+ terminated via SIGTERM (unless the
+ signal to send is changed via
+ KillSignal=). If
+ then after a delay (configured via the
TimeoutSec= option)
processes still remain, the
termination request is repeated with
- the SIGKILL signal. See
+ the SIGKILL signal (unless this is
+ disabled via the
+ SendSIGKILL=
+ option). See
kill2
for more
information.
+
+ KillSignal=
+ Specifies which signal
+ to use when killing a
+ service. Defaults to SIGTERM.
+
+
+
+
+ SendSIGKILL=
+ Specifies whether to
+ send SIGKILL to remaining processes
+ after a timeout, if the normal
+ shutdown procedure left processes of
+ the service around. Takes a boolean
+ value. Defaults to "yes".
+
+
+
NonBlocking=Set O_NONBLOCK flag
@@ -597,7 +621,7 @@
or
. If
no daemon status
- updates are accepted by the service
+ updates are accepted from the service
processes, all status update messages
are ignored. If
only service updates sent from the