X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=man%2Fsystemd.conf.xml;h=56490ef442d7a2626e70d30a5264030245546b07;hb=0c85a4f3efa2883c414ed8ff59aea263b85b7687;hp=95a2e5261b2852142ff80da2ea59de4c6df32202;hpb=f3e219a238c716ffa06fab7b0618197c090dfd5a;p=elogind.git
diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml
index 95a2e5261..56490ef44 100644
--- a/man/systemd.conf.xml
+++ b/man/systemd.conf.xml
@@ -49,7 +49,7 @@
system.conf
- session.conf
+ user.conf
@@ -57,7 +57,7 @@
When run as system instance systemd reads the
configuration file system.conf,
- otherwise session.conf. These
+ otherwise user.conf. These
configuration files contain a few settings controlling
basic manager operations.
@@ -79,12 +79,15 @@
DumpCore=yes
CrashShell=no
ShowStatus=yes
+ SysVConsole=yes
CrashChVT=1
+ DefaultStandardOutput=null
+ DefaultStandardError=inherit
Configures various
parameters of basic manager
operation. These options may be
- overriden by the respective command
+ overridden by the respective command
line arguments. See
systemd1
for details about these command line
@@ -96,9 +99,56 @@
Configures the initial
CPU affinity for the init
- process. Takes a space-seperated list
+ process. Takes a space-separated list
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
+
+ Configures in which
+ cgroup controller 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 an empty
+ string to ensure that systemd does not
+ touch any hierarchies but its
+ own.
+
+
+
+ JoinControllers=cpu,cpuacct
+
+ 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
+ those listed in this setting. Takes a
+ space separated list of comma
+ separated controller names, in order
+ to allow multiple joined
+ hierarchies. Defaults to
+ 'cpu,cpuacct'. Pass an empty string to
+ ensure that systemd mounts all
+ controllers in separate
+ hierarchies.
+