diff --git a/man/systemd-cgtop.xml b/man/systemd-cgtop.xml
index 0e9e5e611aa..51549c4ac2e 100644
--- a/man/systemd-cgtop.xml
+++ b/man/systemd-cgtop.xml
@@ -73,30 +73,23 @@
only accounted for control groups in the
cpuacct hierarchy, memory usage
only for those in memory and disk
- I/O usage for those in
- blkio. systemd1
- by default places all services in their own control
- group in the cpuacct hierarchy, but
- not in memory nor
- blkio. If resource monitoring for
- these resources is required, it is recommended to add
- blkio and memory
- to the DefaultControllers= setting
- in /etc/systemd/system.conf (see
- systemd-system.conf5
- for details). Alternatively, it is possible to enable
- resource accounting individually for services, by
- making use of the ControlGroup=
- option in the unit files (See
- systemd.exec5
+ I/O usage for those in blkio. If
+ resource monitoring for these resources is required,
+ it is recommended to add the
+ CPUAccounting=1,
+ MemoryAccounting=1 and
+ BlockIOAccounting=1 settings in the
+ unit files in question (See
+ systemd.cgroup5
for details).
To emphasize this: unless
- blkio and memory
- are enabled for the services in question with either
- of the options suggested above no resource accounting
- will be available for system services and the data shown
- by systemd-cgtop will be
+ CPUAccounting=1,
+ MemoryAccounting=1 and
+ BlockIOAccounting=1 are enabled for
+ the services in question no resource accounting will
+ be available for system services and the data shown by
+ systemd-cgtop will be
incomplete.
@@ -281,6 +274,7 @@
systemd1,
systemctl1,
systemd-cgls1,
+ systemd.cgroup5,
top1
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index c52e59096ac..e8cf8a9cb24 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -104,32 +104,7 @@
- DefaultControllers=cpu
-
- Configures in which
- control group 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 the empty string to ensure
- that systemd does not touch any
- hierarchies but its own.
-
- Note that the default value of
- 'cpu' will make realtime scheduling
- unavailable to system services. See
- My
- Service Can't Get Realtime!
- for more
- information.
-
-
-
- JoinControllers=cpu,cpuacct,cpuset net_cls,netprio
+ JoinControllers=cpu,cpuacct net_cls,netprio
Configures controllers
that shall be mounted in a single
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index d61426a8454..5c8b8e88689 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -1241,7 +1241,10 @@
%R
Parent directory of the control group path where units are placed.
- For system instances this usually resolves to /, except in containers, where this resolves to the container's root directory. This specifier is particularly useful in the ControlGroup= setting (see systemd.exec5).
+ For system instances this usually
+ resolves to /, except in
+ containers, where this resolves to the
+ container's root directory.
%t
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
index 75e2e45b661..676a07ffa5b 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -103,32 +103,6 @@
" \n" \
" \n" \
" \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " " \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " " \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
" \n" \
" \n" \
" \n" \
@@ -316,7 +290,6 @@
" \n" \
" \n" \
" \n" \
- " \n" \
" \n" \
" \n" \
" \n" \
diff --git a/src/core/system.conf b/src/core/system.conf
index f2817bc5071..7b03c8782bc 100644
--- a/src/core/system.conf
+++ b/src/core/system.conf
@@ -17,10 +17,9 @@
#ShowStatus=yes
#CrashChVT=1
#CPUAffinity=1 2
-#DefaultControllers=cpu
#DefaultStandardOutput=journal
#DefaultStandardError=inherit
-#JoinControllers=cpu,cpuacct,cpuset net_cls,net_prio
+#JoinControllers=cpu,cpuacct net_cls,net_prio
#RuntimeWatchdogSec=0
#ShutdownWatchdogSec=10min
#CapabilityBoundingSet=
diff --git a/src/core/user.conf b/src/core/user.conf
index 4252451eb75..4a0129a9848 100644
--- a/src/core/user.conf
+++ b/src/core/user.conf
@@ -12,6 +12,5 @@
#LogTarget=console
#LogColor=yes
#LogLocation=no
-#DefaultControllers=cpu
#DefaultStandardOutput=inherit
#DefaultStandardError=inherit