X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.service.xml;h=8977873c1ebd81c4f824defbafc7e00c59cb457d;hp=598e863651d65216690de4329049cab6718d8337;hb=cb96a2c69a312fb089fef4501650f4fc40a1420b;hpb=22f38abe9a1dbe4bc3ef46b7073df4869778b840
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 598e86365..8977873c1 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -48,7 +48,7 @@
- systemd.service
+ service.service
@@ -121,7 +121,7 @@
options specific to the [Service]
section of service units are the following:
-
+ Type=
@@ -298,8 +298,9 @@
ExecStart=Commands with their
arguments that are executed when this
- service is started.
-
+ service is started. The first
+ argument must be an absolute path
+ name.
When
Type=oneshot is
@@ -315,14 +316,18 @@
for compatibility with parsers
suitable for XDG
.desktop files.
- The commands are invoked one by
- one sequentially in the order they
- appear in the unit file.
- When Type is
- not , only one
+ The commands are invoked one by one
+ sequentially in the order they appear
+ in the unit file. When
+ Type is not
+ , only one
command may be given. Lone semicolons
may be escaped as
- '\;'.
+ '\;'. If the empty
+ string is assigned to this option the
+ list of commands to start is reset,
+ prior assignments of this option will
+ have no effect.
Unless
Type=forking is
@@ -338,23 +343,6 @@
line (i.e. the program to execute) may
not include specifiers.
- Optionally, if the absolute file
- name is prefixed with
- '@', the second token
- will be passed as
- argv[0] to the
- executed process, followed by the
- further arguments specified. If the
- absolute file name is prefixed with
- '-' an exit code of
- the command normally considered a
- failure (i.e. non-zero exit status or
- abnormal exit due to signal) is ignored
- and considered success. If both
- '-' and
- '@' are used they
- can appear in either order.
-
On top of that basic environment
variable substitution is
supported. Use
@@ -372,10 +360,27 @@
at whitespace, resulting in no or more
arguments. Note that the first
argument (i.e. the program to execute)
- may not be a variable, and must be a
- literal and absolute path
+ may not be a variable, since it must
+ be a literal and absolute path
name.
+ Optionally, if the absolute file
+ name is prefixed with
+ '@', the second token
+ will be passed as
+ argv[0] to the
+ executed process, followed by the
+ further arguments specified. If the
+ absolute file name is prefixed with
+ '-' an exit code of
+ the command normally considered a
+ failure (i.e. non-zero exit status or
+ abnormal exit due to signal) is ignored
+ and considered success. If both
+ '-' and
+ '@' are used they
+ can appear in either order.
+
Note that this setting does not
directly support shell command
lines. If shell command lines are to
@@ -616,8 +621,14 @@
SIGKILL", ensures that exit
codes 1, 2, 8 and the termination
signal SIGKILL are considered clean
- service
- terminations.
+ service terminations. This option may
+ appear more than once in which case
+ the list of successful exit statuses
+ is merged. If the empty string is
+ assigned to this option the list is
+ reset, all prior assignments of this
+ option will have no
+ effect.
@@ -638,9 +649,16 @@
logic. Example:
"RestartPreventExitStatus=1 6
SIGABRT", ensures that exit
- codes 1 and 6 and the termination signal
- SIGABRT will not result in automatic
- service restarting.
+ codes 1 and 6 and the termination
+ signal SIGABRT will not result in
+ automatic service restarting. This
+ option may appear more than once in
+ which case the list of restart preventing
+ statuses is merged. If the empty
+ string is assigned to this option the
+ list is reset, all prior assignments
+ of this option will have no
+ effect.
@@ -728,7 +746,7 @@
open access to the notification socket
when using
Type=notify or
- WatchdogUsec= (see
+ WatchdogSec= (see
above). If those options are used but
NotifyAccess= not
configured it will be implicitly set
@@ -754,13 +772,22 @@
same time. Also note that a different
service may be activated on incoming
traffic than inherits the sockets. Or
- in other words: The
+ 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.
+ doesn't have to match the inverse of
+ the Sockets=
+ setting of the
+ .service it
+ refers to.
+
+ This option may appear more than
+ once, in which case the list of socket
+ units is merged. If the empty string
+ is assigned to this option the list of
+ sockets is reset, all prior uses of
+ this setting will have no
+ effect.
@@ -861,7 +888,7 @@
for compatibility reasons and should not be used in
newly written service files.
-
+ SysVStartPriority=Set the SysV start
@@ -922,7 +949,8 @@
systemctl8,
systemd.unit5,
systemd.exec5,
- systemd.kill5
+ systemd.kill5,
+ systemd.directives7