X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=units%2Fuser%40.service.in;h=8091ce1a0ba6bb4d3ebf56d00dc426e7df4e3a88;hp=ece671d4485f71be6e120bb6f897075ec84fe9a8;hb=66f311206e908a5b6f21e66fad73e1e5ea3e31d6;hpb=9541fe6adff9941e487084c718ff2d46ed2929c6

diff --git a/units/user@.service.in b/units/user@.service.in
index ece671d44..8091ce1a0 100644
--- a/units/user@.service.in
+++ b/units/user@.service.in
@@ -6,18 +6,13 @@
 #  (at your option) any later version.
 
 [Unit]
-Description=User Manager for %I
+Description=User Manager for UID %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.user/shared cpu:/
-ControlGroupModify=yes
+User=%i
+PAMName=systemd-user
 Type=notify
 ExecStart=-@rootlibexecdir@/systemd --user
-Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%U/dbus/user_bus_socket
-
-[Install]
-Alias=user@%i.service
+Slice=user-%i.slice
+KillMode=mixed