X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd-system.conf.xml;h=dfb180cc54c0dfb9649ca5ee38cdc605bcf6b468;hb=5ffa8c818120e35c89becd938d160235c069dd12;hp=3814bd2ad8a20c60ecab4ee1ec969433a6f594a3;hpb=b2f8b02ec27dfec9cbd23573f47aba494f2e9b5f;p=elogind.git
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index 3814bd2ad..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.conf
systemd
@@ -44,25 +45,39 @@
systemd-system.conf
+ system.conf.d
systemd-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/*.conf
Description
- 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
@@ -187,7 +202,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 +269,6 @@
signal.
-
TimerSlackNSec=
@@ -301,18 +315,6 @@
above.
-
- DefaultCPUQuotaPeriodSec=
-
- Sets the default CPU
- quota period. Defaults to 100ms. This
- controls th global default for the
- CPUQuotaPeriodSec=
- setting of units, see
- systemd.resource-control5
- for details.
-
-
DefaultTimeoutStartSec=
DefaultTimeoutStopSec=
@@ -359,7 +361,7 @@
executed processes. Takes a
space-separated list of variable
assignments. See
- environ7
+ environ7
for details about environment
variables.
@@ -433,8 +435,8 @@
systemd.directives7,
systemd.exec5,
systemd.service5,
- environ7,
- capabilities7
+ environ7,
+ capabilities7