X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=man%2Fsystemd.conf.xml;h=ba144da8cf89b3f55de6779c99b3d14b5d41ac63;hb=706343f492725fe430879c5d4a3485d7c49b0601;hp=32eae2b8e0a98587b179564d11e1a5bdbf8d7b24;hpb=06d4c99ab3d479c1a7c087a87e82fe01626128f6;p=elogind.git
diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml
index 32eae2b8e..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
@@ -121,12 +123,32 @@
create per-service cgroups
automatically, in addition to the
name=systemd named hierarchy. Defaults
- to 'cpu'. Takes a space seperated list
+ to 'cpu'. Takes a space separated list
of controller names. Pass an empty
string to ensure that systemd does not
- touch any hiearchies but its
+ 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.
+