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=a7dfc0329c6891e62875cf56521d9eb315a39924;hpb=085afe36cb823e7d5b8c5f3ef21ebb9639bac78b;p=elogind.git
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index a7dfc0329..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,13 +269,12 @@
signal.
-
TimerSlackNSec=
Sets the timer slack
- in nanoseconds for PID 1 which is then
- inherited to all executed processes,
+ in nanoseconds for PID 1, which is
+ inherited by all executed processes,
unless overridden individually, for
example with the
TimerSlackNSec=
@@ -268,7 +282,8 @@
see
systemd.exec5). The
timer slack controls the accuracy of
- wake-ups triggered by timers. See
+ wake-ups triggered by system
+ timers. See
prctl2
for more information. Note that in
contrast to most other time span
@@ -279,6 +294,27 @@
too.
+
+ DefaultTimerAccuracySec=
+
+ Sets the default
+ accuracy of timer units. This controls
+ the global default for the
+ AccuracySec=
+ setting of timer units, see
+ systemd.timer5
+ for
+ details. AccuracySec=
+ set in individual units override the
+ global default for the specific
+ unit. Defaults to 1min. Note that the
+ accuracy of timer units is also
+ affected by the configured timer slack
+ for PID 1, see
+ TimerSlackNSec=
+ above.
+
+
DefaultTimeoutStartSec=
DefaultTimeoutStopSec=
@@ -325,7 +361,7 @@
executed processes. Takes a
space-separated list of variable
assignments. See
- environ7
+ environ7
for details about environment
variables.
@@ -399,8 +435,8 @@
systemd.directives7,
systemd.exec5,
systemd.service5,
- environ7,
- capabilities7
+ environ7,
+ capabilities7