X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.service.xml;h=6e81c5429bbd316f1fd00a5f8b2c69abd6bffab1;hb=9e37c9544b22aab2173695ac9c0e4b8bb02cb75c;hp=50ff2f5bd5ac71d30fcc32b3ef233c8b063380c6;hpb=5d9a2698e74eefc20ea7cbbaeaffb566e398f2ba;p=elogind.git
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 50ff2f5bd..6e81c5429 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).
@@ -593,8 +593,9 @@
(i.e. the "keep-alive ping"). If the time
between two such calls is larger than
the configured time, then the service
- is placed in a failed state. By
- setting Restart= to
+ is placed in a failed state and it will
+ be terminated with SIGABRT.
+ By setting Restart= to
or
, the service
will be automatically restarted. The
@@ -968,21 +969,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
@@ -1126,40 +1130,6 @@
-
- Compatibility Options
-
- The following options are also available in the
- [Service] section, but exist purely
- for compatibility reasons and should not be used in
- newly written service files.
-
-
-
- SysVStartPriority=
- Set the SysV start
- priority to use to order this service
- in relation to SysV services lacking
- LSB headers. This option is only
- necessary to fix ordering in relation
- to legacy SysV services that have no
- ordering information encoded in the
- script headers. As such, it should only
- be used as a temporary compatibility
- option and should not be used in new unit
- files. 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
- range 0-99.
-
-
-
-
Command lines