X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.service.xml;h=ee4d3937565b97c6f35649170212f6f8c2ab56f8;hp=7fc3205ff14b99d91c1e4eca4f4be5c2508e4530;hb=ba035df230e41bf9d70ebb47915c9472b7884412;hpb=a1102c1f63dfee7f3649c86c5d8df8faba541123
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 7fc3205ff..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
@@ -307,14 +307,14 @@
the command in
ExecStart=. Multiple
command lines may be concatenated in a
- single directive, by seperating them
+ single directive, by separating them
by semicolons (these semicolons must
be passed as separate words). In that
case, the commands are executed one
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
@@ -344,7 +344,7 @@
daemon, and may be used for command
lines like the following:
/bin/kill -HUP
- $(MAINPID).
+ $MAINPID.
@@ -368,7 +368,7 @@
requested. Specifier and environment
variable substitution is supported
(including
- $(MAINPID), see
+ $MAINPID, see
above).
@@ -426,19 +426,28 @@
Restart=Configures whether the
- main service process shall be restarted when
- it exists. Takes one of
+ main service process shall be
+ restarted when it exits. Takes one of
,
- or
- . If
- set to (the
- default) the service will not be
- restarted when it exits. If set to
- it
- will be restarted only when it exited
- cleanly, i.e. terminated with an exit
- code of 0. If set to
- the
+ ,
+ ,
+ or
+ . If set to
+ (the default) the
+ service will not be restarted when it
+ exits. If set to
+ it will be
+ restarted only when it exited cleanly,
+ i.e. terminated with an exit code of
+ 0. If set to
+ it will be
+ restarted only when it exited with an
+ exit code not equalling 0, or when
+ terminated by a signal. If set to
+ it will be
+ restarted only if it exits due to
+ reception of an uncaught signal. If
+ set to the
service will be restarted regardless
whether it exited cleanly or not, or
got terminated abnormally by a
@@ -548,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
@@ -588,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
@@ -629,6 +662,33 @@
refers to.
+
+ FsckPassNo=
+ Set the fsck passno
+ priority to use to order this service
+ in relation to other file system
+ checking services. This option is only
+ necessary to fix ordering in relation
+ to fsck jobs automatically created for
+ all /etc/fstab
+ entries with a value in the fs_passno
+ column > 0. As such it should only be
+ used as option for fsck
+ services. Almost always it is a better
+ choice to add explicit ordering
+ directives via
+ After= or
+ Before=,
+ instead. For more details see
+ systemd.unit5. If
+ used, pass an integer value in the
+ same range as
+ /etc/fstab's
+ fs_passno column. See
+ fstab5
+ for details.
+
+