logind: port over to use scopes+slices for all cgroup stuff

[elogind.git] / units / user@.service.in

diff --git a/units/user@.service.in b/units/user@.service.in
index ece671d4485f71be6e120bb6f897075ec84fe9a8..d2d24f10bc0530ca239ca687e247ef4f6444f886 100644 (file)
--- 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