X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd-system.conf.xml;h=dfb180cc54c0dfb9649ca5ee38cdc605bcf6b468;hb=9b15b7846d4de01bb5d9700a24077787e984e8ab;hp=1fad1dba80191e47556b97f7c1a5c605dd51e46d;hpb=f07756bfe25c64119704c93a634162d6c88b5c89;p=elogind.git
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index 1fad1dba8..dfb180cc5 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -22,7 +22,8 @@
along with systemd; If not, see .
-->
-
+systemd-system.confsystemd
@@ -44,25 +45,39 @@
systemd-system.conf
+ system.conf.dsystemd-user.conf
- System and session service manager configuration file
+ user.conf.d
+ System and session service manager configuration files/etc/systemd/system.conf
+ /etc/systemd/system.conf.d/*.conf
+ /run/systemd/system.conf.d/*.conf
+ /usr/lib/systemd/system.conf.d/*.conf/etc/systemd/user.conf
+ /etc/systemd/user.conf.d/*.conf
+ /run/systemd/user.conf.d/*.conf
+ /usr/lib/systemd/user.conf.d/*.confDescription
- When run as system instance systemd reads the
- configuration file system.conf,
- otherwise user.conf. These
+ When run as a system instance, systemd interprets the
+ configuration file system.conf and the
+ files in system.conf.d directories; when
+ run as a user instance, systemd interprets the configuration
+ file user.conf and the files in
+ user.conf.d directories. These
configuration files contain a few settings controlling
basic manager operations.
+
+
+
Options
@@ -279,32 +294,6 @@
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=