X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=man%2Fsystemd.service.xml;h=0baddd1d4f02cf97d5c77696ed4f527476014873;hb=2f9dec073b6557401804aae180eab744a8b1a3cc;hp=3bd058f00bb81a88177c24dbd179f0a55b054f2e;hpb=be0396695bae9227ad69fcb61066bd84b3974e16;p=elogind.git
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 3bd058f00..0baddd1d4 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -180,7 +180,7 @@
acquired. Service units with this
option configured implicitly gain
dependencies on the
- dbus.target
+ dbus.socket
unit.
Behaviour of
@@ -215,6 +215,30 @@
+
+ GuessMainPID=
+
+ Takes a boolean value
+ that specifies whether systemd should
+ try to guess the main PID of a service
+ should if it cannot be determined
+ reliably. This option is ignored
+ unless
+ is set and
+ is unset because for the other types
+ or with an explicitly configured PID
+ file the main PID is always known. The
+ guessing algorithm might come to
+ incorrect conclusions if a daemon
+ consists of more than one process. If
+ the main PID cannot be determined
+ failure detection and automatic
+ restarting of a service will not work
+ reliably. Defaults to
+ .
+
+
+
PIDFile=
@@ -287,20 +311,28 @@
main process of the daemon. The
command line accepts % specifiers as
described in
- systemd.unit5. On
- top of that basic environment variable
- substitution is supported, where
- ${FOO} is replaced
- by the string value of the environment
- variable of the same name. Also
- $FOO may appear as
- separate word on the command line in
- which case the variable is replaced by
- its value split at whitespaces. Note
- that the first argument (i.e. the
- binary to execute) may not be a
- variable, and must be a literal and
- absolute path name.
+ systemd.unit5.
+
+ On top of that basic environment
+ variable substitution is
+ supported. Use
+ ${FOO} as part of a
+ word, or as word of its own on the
+ command line, in which case it will be
+ replaced by the value of the
+ environment variable including all
+ whitespace it 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 up
+ 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
+ name.
@@ -424,7 +456,7 @@
time span value such as "5min
20s". Pass 0 to disable the timeout
logic. Defaults to
- 60s.
+ 90s.
@@ -534,7 +566,6 @@
processes of this service shall be
killed. One of
,
- ,
,
.
@@ -546,10 +577,6 @@
stop command (as configured with
ExecStop=) is
executed. If set to
- only
- the members of the process group of
- the main service process are
- killed. If set to
only the main
process itself is killed. If set to
no process is
@@ -644,11 +671,11 @@
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
+ service is started. Normally it
should not be necessary to use this
setting as all sockets whose unit
shares the same name as the service
+ (ignoring the different suffix of course)
are passed to the spawned
process.