X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.service.xml;h=115d1692ed4390653ac312a75f2a8a64cd19efe1;hb=43b133b4e09a0e991ba1680b9ef5458b24f9dcc9;hp=dbc82edbd47bbcf0e56662faaa3a2abf59b6daa4;hpb=30d88d54f613f9f7831172876ebfd9e285fb043b;p=elogind.git
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index dbc82edbd..115d1692e 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -365,7 +365,7 @@
used, zero or more commands may be
specified. This can be specified by
providing multiple command lines in
- the same directive , or alternatively,
+ the same directive, or alternatively,
this directive may be specified more
than once with the same effect. If the
empty string is assigned to this
@@ -548,7 +548,7 @@
when Type=oneshot is
used, in which case the timeout
is disabled by default
- (see systemd-systemd.conf5).
+ (see systemd-system.conf5).
@@ -569,7 +569,7 @@
the timeout logic. Defaults to
DefaultTimeoutStopSec= from the
manager configuration file
- (see systemd-systemd.conf5).
+ (see systemd-system.conf5).
@@ -968,21 +968,24 @@
Sockets=
Specifies the name of
the socket units this service shall
- inherit the sockets from when the
- service is started. Normally it
- should not be necessary to use this
- setting as all sockets whose unit
+ inherit socket file descriptors
+ from when the service is
+ started. Normally it should not be
+ necessary to use this setting as all
+ socket file descriptors whose unit
shares the same name as the service
- (ignoring the different suffix of course)
- 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 that which inherits the
- sockets. Or in other words: the
+ (subject to the different unit name
+ suffix of course) are passed to the
+ spawned process.
+
+ Note that the same socket file
+ descriptors may be passed to multiple
+ processes simultaneously. Also note
+ that a different service may be
+ activated on incoming socket traffic
+ than the one which is ultimately
+ configured to inherit the socket file
+ descriptors. Or in other words: the
Service= setting of
.socket units
does not have to match the inverse of
@@ -1215,13 +1218,39 @@
contains, resulting in a single argument. Use
$FOO as a separate word on the
command line, in which case it will be replaced by the
- value of the environment variable split at whitespace,
- resulting in zero or more arguments. To pass a literal
- dollar sign, use $$. Variables
- whose value is not known at expansion time are treated
- as empty strings. Note that the first argument
- (i.e. the program to execute) may not be a
- variable.
+ value of the environment variable split at whitespace
+ resulting in zero or more arguments. For this type of
+ expansion, quotes and respected when splitting into
+ words, and afterwards removed.
+
+ Example:
+
+ Environment="ONE=one" 'TWO=two two'
+ExecStart=/bin/echo $ONE $TWO ${TWO}
+
+ This will execute /bin/echo
+ with four arguments: one,
+ two, two, and
+ two two.
+
+ Example:
+ Environment=ONE='one' "TWO='two two' too" THREE=
+ExecStart=/bin/echo ${ONE} ${TWO} ${THREE}
+ExecStart=/bin/echo $ONE $TWO $THREE
+ This results in echo being
+ called twice, the first time with arguments
+ 'one',
+ 'two two' too, ,
+ and the second time with arguments
+ one, two two,
+ too.
+
+
+ To pass a literal dollar sign, use
+ $$. Variables whose value is not
+ known at expansion time are treated as empty
+ strings. Note that the first argument (i.e. the
+ program to execute) may not be a variable.
Variables to be used in this fashion may be
defined through Environment= and
@@ -1259,16 +1288,6 @@
>/dev/null,
&, ;, and
/bin/ls.
-
- Example:
-
- Environment="ONE=one" 'TWO=two two'
-ExecStart=/bin/echo $ONE $TWO ${TWO}
-
- This will execute /bin/echo
- with four arguments: one,
- two, two, and
- two two.