X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd-system.conf.xml;h=1fad1dba80191e47556b97f7c1a5c605dd51e46d;hp=e2b2bd8b6f75846c01e405d5bb5aff330efbe3d0;hb=c2fa048c4a70c8386c6d8fe939e5ea9edecf1e98;hpb=9a0549093332880df47c4218209ce126b8586835
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index e2b2bd8b6..1fad1dba8 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -187,7 +187,7 @@
capabilities to include in the
capability bounding set for PID 1 and
its children. See
- capabilities7
+ capabilities7
for details. Takes a whitespace-separated
list of capability names as read by
cap_from_name3.
@@ -254,7 +254,6 @@
signal.
-
TimerSlackNSec=
@@ -280,6 +279,32 @@
too.
+
+ StartTimeoutSec=
+ StartTimeoutAction=
+ StartTimeoutRebootArgument=
+
+ Configures an over-all
+ system start-up timeout and controls
+ what to do when the timeout is
+ reached. StartTimeoutSec=
+ specifies the timeout, and defaults to
+ 15min. StartTimeoutAction=
+ configures the action to take when the
+ system did not finish boot-up within
+ the specified time. It takes the same
+ values as the per-service
+ StartLimitAction=
+ setting, see
+ systemd.service5
+ for details. Defaults to
+ . StartTimeoutRebootArgument=
+ configures an optional reboot string
+ to pass to the
+ reboot2
+ system call.
+
+
DefaultTimerAccuracySec=
@@ -347,7 +372,7 @@
executed processes. Takes a
space-separated list of variable
assignments. See
- environ7
+ environ7
for details about environment
variables.
@@ -421,8 +446,8 @@
systemd.directives7,
systemd.exec5,
systemd.service5,
- environ7,
- capabilities7
+ environ7,
+ capabilities7