X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.service.xml;h=c77992d07c6e1749df86f434fdcef0629064d48b;hp=6ab3bc3601d28b69b1a03ee575eede6bf42125ef;hb=a7c64469b68f442bcaaf771ac14a88c1b2a08b29;hpb=d2f316345cfadd07025b1a1770f63804e33c4b50
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 6ab3bc360..c77992d07 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -307,7 +307,7 @@
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
@@ -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
- ,
- 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
+ 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
+ it will be
+ restared 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,7 +557,7 @@
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
@@ -588,7 +597,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
@@ -602,6 +611,60 @@
Type=notify (see above).
+
+ Sockets=
+ Specifies the name of
+ the socket units this service shall
+ inherit the sockets from when the
+ service (ignoring the different suffix
+ of course) is started. Normally it
+ should not be necessary to use this
+ setting as all sockets whose unit
+ shares the same name as the service
+ are passed to the spawned
+ process.
+
+ Note that the same socket may be
+ passed to multiple processes at the
+ same time. Also note that a different
+ service may be activated on incoming
+ traffic than inherits the sockets. Or
+ in other words: The
+ Service= setting of
+ .socket units
+ doesn't have to match the inverse of the
+ Sockets= setting of
+ the .service it
+ 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.
+
+