X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.service.xml;h=f7cbbb489cc91c0c4cb6e7d8f35a9867cc271ecc;hp=63e5b16e538c9bb6ad8b14066d63f62d255d08a2;hb=74051b9b5865586bf4d30b9075649af838fb92bd;hpb=9cc2c8b763fb4b9ddda95756a727a438a0d2a012
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 63e5b16e5..f7cbbb489 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -315,14 +315,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 +342,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
@@ -376,6 +363,23 @@
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 +620,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 +648,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.
@@ -754,13 +771,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.