X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.conf.xml;h=8faedda6c297a3abbcab128c9779438ae0f76d3a;hb=100fd5676c53c6709442a22db0253cc57f05c46d;hp=6759f978148b5f3f6a8a837aa4dff08ed1ad7cfa;hpb=af2d49f70bcff20efaf2d69aecaf4b3e898ff1fa;p=elogind.git
diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml
index 6759f9781..8faedda6c 100644
--- a/man/systemd.conf.xml
+++ b/man/systemd.conf.xml
@@ -81,11 +81,13 @@
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
@@ -112,6 +114,21 @@
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.
+