From fd5b2125c19d5c57f4f9338327637025cb46869b Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 15 Jan 2013 18:17:53 +0100
Subject: [PATCH] man: add reference to wiki doc from DefaultControllers=
setting (cherry picked from commit b02a01dc08317e961545521359f963752bd2c206)
---
man/systemd.conf.xml | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml
index da3c7f7..d0164ca 100644
--- a/man/systemd.conf.xml
+++ b/man/systemd.conf.xml
@@ -114,7 +114,16 @@
of controller names. Pass an empty
string to ensure that systemd does not
touch any hierarchies but its
- own.</para></listitem>
+ own.</para>
+
+ <para>Note that the default value of
+ 'cpu' will make realtime scheduling
+ unavailable to system services. See
+ <ulink
+ url="http://www.freedesktop.org/wiki/Software/systemd/MyServiceCantGetRealtime">My
+ Service Can't Get Realtime!</ulink>
+ for more
+ information.</para></listitem>
</varlistentry>
<varlistentry>
@@ -144,10 +153,10 @@
this option is changed, and make sure
the new configuration file is included
in it. Otherwise the initrd might
- mount the controllers in different
- configuration than intended, and the
- main system cannot remount them
- anymore.</para></listitem>
+ mount the controller hierachies in a
+ different configuration than intended,
+ and the main system cannot remount
+ them anymore.</para></listitem>
</varlistentry>
<varlistentry>