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=54a8398d43f6a98985a83e3a3eac31f104ffa616;hpb=5471472d441d9ac48640f11a3b07e6a1fd6d1b63;p=elogind.git
diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml
index 54a8398d4..ba144da8c 100644
--- a/man/systemd.conf.xml
+++ b/man/systemd.conf.xml
@@ -81,6 +81,8 @@
ShowStatus=yes
SysVConsole=yes
CrashChVT=1
+ DefaultStandardOutput=journal
+ DefaultStandardError=inherit
Configures various
parameters of basic manager
@@ -127,6 +129,26 @@
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.
+