X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd-system.conf.xml;h=dfb180cc54c0dfb9649ca5ee38cdc605bcf6b468;hb=9b0374e954f504701fbe5d3f68d65360139ca2f9;hp=eaa770b4b1ef0fdc1b03ee7a1a5938d0c2b67553;hpb=37d3ab1b7e114f0fb6dfb2e7273569b42794b76a;p=elogind.git
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index eaa770b4b..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,26 +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
@@ -100,46 +114,21 @@
Configures the initial
CPU affinity for the init
process. Takes a space-separated list
- of CPU indexes.
+ of CPU indices.
- DefaultControllers=cpu
-
- Configures in which
- control group hierarchies to create
- per-service cgroups automatically, in
- addition to the
- name=systemd named
- hierarchy. Defaults to
- cpu. Takes a space
- separated list of controller
- names. Pass the empty string to ensure
- that systemd does not touch any
- hierarchies but its own.
-
- Note that the default value of
- 'cpu' will make realtime scheduling
- unavailable to system services. See
- My
- Service Can't Get Realtime!
- for more
- information.
-
-
-
- JoinControllers=cpu,cpuacct,cpuset net_cls,netprio
+ JoinControllers=cpu,cpuacct net_cls,netprio
Configures controllers
that shall be mounted in a single
- hierarchy. By default systemd will
+ hierarchy. By default, systemd will
mount all controllers which are
enabled in the kernel in individual
hierarchies, with the exception of
those listed in this setting. Takes a
- space separated list of comma
- separated controller names, in order
+ space-separated list of comma-separated
+ controller names, in order
to allow multiple joined
hierarchies. Defaults to
'cpu,cpuacct'. Pass an empty string to
@@ -150,12 +139,12 @@
Note that this option is only
applied once, at very early boot. If
you use an initial RAM disk (initrd)
- that uses systemd it might hence be
+ that uses systemd, it might hence be
necessary to rebuild the initrd if
this option is changed, and make sure
the new configuration file is included
- in it. Otherwise the initrd might
- mount the controller hierachies in a
+ in it. Otherwise, the initrd might
+ mount the controller hierarchies in a
different configuration than intended,
and the main system cannot remount
them anymore.
@@ -175,7 +164,7 @@
d,
w). If
RuntimeWatchdogSec=
- is set to a non-zero value the
+ is set to a non-zero value, the
watchdog hardware
(/dev/watchdog)
will be programmed to automatically
@@ -213,15 +202,14 @@
capabilities to include in the
capability bounding set for PID 1 and
its children. See
- capabilities7
- for details. Takes a whitespace
- separated list of capability names as
- read by
+ capabilities7
+ for details. Takes a whitespace-separated
+ list of capability names as read by
cap_from_name3.
Capabilities listed will be included
in the bounding set, all others are
removed. If the list of capabilities
- is prefixed with ~ all but the listed
+ is prefixed with ~, all but the listed
capabilities will be included, the
effect of the assignment
inverted. Note that this option also
@@ -238,12 +226,55 @@
are lost for good.
+
+ SystemCallArchitectures=
+
+ Takes a
+ space-separated list of architecture
+ identifiers. Selects from which
+ architectures system calls may be
+ invoked on this system. This may be
+ used as an effective way to disable
+ invocation of non-native binaries
+ system-wide, for example to prohibit
+ execution of 32-bit x86 binaries on
+ 64-bit x86-64 systems. This option
+ operates system-wide, and acts
+ similar to the
+ SystemCallArchitectures=
+ setting of unit files, see
+ systemd.exec5
+ for details. This setting defaults to
+ the empty list, in which case no
+ filtering of system calls based on
+ architecture is applied. Known
+ architecture identifiers are
+ x86,
+ x86-64,
+ x32,
+ arm and the special
+ identifier
+ native. The latter
+ implicitly maps to the native
+ architecture of the system (or more
+ specifically, the architecture the
+ system manager was compiled for). Set
+ this setting to
+ native to prohibit
+ execution of any non-native
+ binaries. When a binary executes a
+ system call of an architecture that is
+ not listed in this setting, it will be
+ immediately terminated with the SIGSYS
+ 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=
@@ -251,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
@@ -262,6 +294,104 @@
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=
+ DefaultRestartSec=
+
+ Configures the default
+ timeouts for starting and stopping of
+ units, as well as the default time to
+ sleep between automatic restarts of
+ units, as configured per-unit in
+ TimeoutStartSec=,
+ TimeoutStopSec= and
+ RestartSec= (for
+ services, see
+ systemd.service5
+ for details on the per-unit
+ settings). For non-service units,
+ DefaultTimeoutStartSec=
+ sets the default
+ TimeoutSec= value.
+
+
+
+
+ DefaultStartLimitInterval=
+ DefaultStartLimitBurst=
+
+ Configure the default
+ unit start rate limiting, as
+ configured per-service by
+ StartLimitInterval=
+ and
+ StartLimitBurst=. See
+ systemd.service5
+ for details on the per-service
+ settings.
+
+
+
+ DefaultEnvironment=
+
+ Sets manager
+ environment variables passed to all
+ executed processes. Takes a
+ space-separated list of variable
+ assignments. See
+ environ7
+ for details about environment
+ variables.
+
+ Example:
+
+ DefaultEnvironment="VAR1=word1 word2" VAR2=word3 "VAR3=word 5 6"
+
+ Sets three variables
+ VAR1,
+ VAR2,
+ VAR3.
+
+
+
+ DefaultCPUAccounting=
+ DefaultBlockIOAccounting=
+ DefaultMemoryAccounting=
+
+ Configure the default
+ resource accounting settings, as
+ configured per-unit by
+ CPUAccounting=,
+ BlockIOAccounting=
+ and
+ MemoryAccounting=. See
+ systemd.resource-control5
+ for details on the per-unit
+ settings.
+
+
DefaultLimitCPU=
DefaultLimitFSIZE=
@@ -302,7 +432,11 @@
See Also
systemd1,
- systemd.directives7
+ systemd.directives7,
+ systemd.exec5,
+ systemd.service5,
+ environ7,
+ capabilities7