X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=units%2Fuser%40.service.in;h=d2d24f10bc0530ca239ca687e247ef4f6444f886;hp=901a334ef64f7e6afe2ea5b22f914aab6a839d02;hb=a0f9c810faa022c264bf534ab9495e0e9f617962;hpb=3abcb6acedb588ca17f6374c1836f8a58396e520

diff --git a/units/user@.service.in b/units/user@.service.in
index 901a334ef..d2d24f10b 100644
--- a/units/user@.service.in
+++ b/units/user@.service.in
@@ -6,18 +6,16 @@
 #  (at your option) any later version.
 
 [Unit]
-Description=User Manager for %u
+Description=User Manager for %I
 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/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