From 06d4c99ab3d479c1a7c087a87e82fe01626128f6 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 18 Nov 2010 00:42:35 +0100
Subject: manager: make list of default controllers configurable

---
 man/systemd.conf.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'man')

diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml
index 6759f97814..32eae2b8e0 100644
--- a/man/systemd.conf.xml
+++ b/man/systemd.conf.xml
@@ -112,6 +112,21 @@
                                 whether this job is left to some other
                                 system script.</para></listitem>
                         </varlistentry>
+
+                        <varlistentry>
+                                <term><varname>DefaultControllers=cpu</varname></term>
+
+                                <listitem><para>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 seperated list
+                                of controller names. Pass an empty
+                                string to ensure that systemd does not
+                                touch any hiearchies but its
+                                own.</para></listitem>
+                        </varlistentry>
                 </variablelist>
         </refsect1>
 
-- 
cgit v1.2.3-54-g00ecf