X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.conf.xml;h=ba144da8cf89b3f55de6779c99b3d14b5d41ac63;hb=9b1a953e08917030489cd9adb2a17dfd407ce14b;hp=6759f978148b5f3f6a8a837aa4dff08ed1ad7cfa;hpb=af2d49f70bcff20efaf2d69aecaf4b3e898ff1fa;p=elogind.git
diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml
index 6759f9781..ba144da8c 100644
--- a/man/systemd.conf.xml
+++ b/man/systemd.conf.xml
@@ -81,11 +81,13 @@
ShowStatus=yes
SysVConsole=yes
CrashChVT=1
+ DefaultStandardOutput=journal
+ 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
@@ -112,6 +114,41 @@
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.
+