summaryrefslogtreecommitdiff
path: root/units/user@.service.in
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-07-02 01:46:30 +0200
committerLennart Poettering <lennart@poettering.net>2013-07-02 01:48:55 +0200
commitfb6becb4436ae4078337011b2017ce294e7361cf (patch)
tree5e80cea85b91f039563907c830cd1d38f19c375c /units/user@.service.in
parent358712f3de33789b2d1293825f1add2c6f4b8e66 (diff)
downloadsystemd-fb6becb4436ae4078337011b2017ce294e7361cf.tar.gz
logind: port over to use scopes+slices for all cgroup stuff
In order to prepare things for the single-writer cgroup scheme, let's make logind use systemd's own primitives for cgroup management. Every login user now gets his own private slice unit, in which his sessions live in a scope unit each. Also, add user@$UID.service to the same slice, and implicitly start it on first login.
Diffstat (limited to 'units/user@.service.in')
-rw-r--r--units/user@.service.in6
1 files changed, 2 insertions, 4 deletions
diff --git a/units/user@.service.in b/units/user@.service.in
index ece671d448..d2d24f10bc 100644
--- a/units/user@.service.in
+++ b/units/user@.service.in
@@ -12,12 +12,10 @@ After=systemd-user-sessions.service
[Service]
User=%I
PAMName=systemd-shared
-# in order to allow MEM_CG features to work, add "memory:/" here
-ControlGroup=%R/user/%U.user/shared cpu:/
-ControlGroupModify=yes
Type=notify
ExecStart=-@rootlibexecdir@/systemd --user
-Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%U/dbus/user_bus_socket
+Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%I/dbus/user_bus_socket
+Slice=user-%i.slice
[Install]
Alias=user@%i.service