X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.conf.xml;h=8c8fb7d7c04041592d888458d9ff69442dac8a30;hb=55c0b89c575fcb2c075286d444ed4fb1cf8c8563;hp=7dc5cc13ce0f598c52b378eba9a6c35e1b4f9301;hpb=34511ca7b166b0e89d08ff9870b0cf2624a7815f;p=elogind.git
diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml
index 7dc5cc13c..8c8fb7d7c 100644
--- a/man/systemd.conf.xml
+++ b/man/systemd.conf.xml
@@ -69,7 +69,7 @@
All options are configured in the
[Manager] section:
-
+
LogLevel=
@@ -114,11 +114,20 @@
of controller names. Pass an empty
string to ensure that systemd does not
touch any hierarchies but its
- own.
+ 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
+ JoinControllers=cpu,cpuacct,cpuset net_cls,netprio
Configures controllers
that shall be mounted in a single
@@ -134,7 +143,20 @@
'cpu,cpuacct'. Pass an empty string to
ensure that systemd mounts all
controllers in separate
- hierarchies.
+ hierarchies.
+
+ 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
+ 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
+ different configuration than intended,
+ and the main system cannot remount
+ them anymore.
@@ -201,7 +223,7 @@
capabilities will be included, the
effect of the assignment
inverted. Note that this option also
- effects the respective capabilities in
+ affects the respective capabilities in
the effective, permitted and
inheritable capability sets. The
capability bounding set may also be
@@ -220,7 +242,7 @@
Sets the timer slack
in nanoseconds for PID 1 which is then
inherited to all executed processes,
- unless overriden individually, for
+ unless overridden individually, for
example with the
TimerSlackNSec=
setting in service units (for details
@@ -264,7 +286,7 @@
infinity to
configure no limit on a specific
resource. These settings may be
- overriden in individual units
+ overridden in individual units
using the corresponding LimitXXX=
directives. Note that these resource
limits are only defaults for units,
@@ -277,7 +299,8 @@
See Also
- systemd1
+ systemd1,
+ systemd.directives7