X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.conf.xml;h=8c8fb7d7c04041592d888458d9ff69442dac8a30;hb=aa7cb2098302d45c8768ca08bf1e433a19aa46b9;hp=d05a30bd48e41b254a3c74b9fb6b824dcc398d57;hpb=5430f7f2bc7330f3088b894166bf3524a067e3d8;p=elogind.git
diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml
index d05a30bd4..8c8fb7d7c 100644
--- a/man/systemd.conf.xml
+++ b/man/systemd.conf.xml
@@ -44,12 +44,12 @@
systemd.conf
- systemd manager configuration file
+ System and service manager configuration file
- system.conf
- user.conf
+ /etc/systemd/system.conf
+ /etc/systemd/user.conf
@@ -69,7 +69,7 @@
All options are configured in the
[Manager] section:
-
+
LogLevel=
@@ -79,7 +79,6 @@
DumpCore=yes
CrashShell=no
ShowStatus=yes
- SysVConsole=yes
CrashChVT=1
DefaultStandardOutput=journal
DefaultStandardError=inherit
@@ -103,18 +102,6 @@
of CPU indexes.
-
- MountAuto=yes
- SwapAuto=yes
-
- Configures whether
- systemd should automatically activate
- all swap or mounts listed in
- /etc/fstab, or
- whether this job is left to some other
- system script.
-
-
DefaultControllers=cpu
@@ -127,18 +114,27 @@
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
hierarchy. By default systemd will
mount all controllers which are
enabled in the kernel in individual
- hierachies, with the exception of
+ hierarchies, with the exception of
those listed in this setting. Takes a
space separated list of comma
separated controller names, in order
@@ -147,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.
@@ -194,13 +203,104 @@
effect if a hardware watchdog is not
available.
+
+
+ CapabilityBoundingSet=
+
+ Controls which
+ 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
+ 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
+ capabilities will be included, the
+ effect of the assignment
+ inverted. Note that this option also
+ affects the respective capabilities in
+ the effective, permitted and
+ inheritable capability sets. The
+ capability bounding set may also be
+ individually configured for units
+ using the
+ CapabilityBoundingSet=
+ directive for units, but note that
+ capabilities dropped for PID 1 cannot
+ be regained in individual units, they
+ are lost for good.
+
+
+
+ TimerSlackNSec=
+
+ Sets the timer slack
+ in nanoseconds for PID 1 which is then
+ inherited to all executed processes,
+ unless overridden individually, for
+ example with the
+ TimerSlackNSec=
+ setting in service units (for details
+ see
+ systemd.exec5). The
+ timer slack controls the accuracy of
+ wake-ups triggered by timers. See
+ prctl2
+ for more information. Note that in
+ contrast to most other time span
+ definitions this parameter takes an
+ integer value in nano-seconds if no
+ unit is specified. The usual time
+ units are understood
+ too.
+
+
+
+ DefaultLimitCPU=
+ DefaultLimitFSIZE=
+ DefaultLimitDATA=
+ DefaultLimitSTACK=
+ DefaultLimitCORE=
+ DefaultLimitRSS=
+ DefaultLimitNOFILE=
+ DefaultLimitAS=
+ DefaultLimitNPROC=
+ DefaultLimitMEMLOCK=
+ DefaultLimitLOCKS=
+ DefaultLimitSIGPENDING=
+ DefaultLimitMSGQUEUE=
+ DefaultLimitNICE=
+ DefaultLimitRTPRIO=
+ DefaultLimitRTTIME=
+
+ These settings control
+ various default resource limits for
+ units. See
+ setrlimit2
+ for details. Use the string
+ infinity to
+ configure no limit on a specific
+ resource. These settings may be
+ overridden in individual units
+ using the corresponding LimitXXX=
+ directives. Note that these resource
+ limits are only defaults for units,
+ they are not applied to PID 1
+ itself.
+
See Also
- systemd1
+ systemd1,
+ systemd.directives7