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=91e3b2515836827750eef478a9c2787d3212f0dc;hb=58ea275a68cd242ad60161bcb7582614d1d89f13;hpb=e0d25329b23a43332ea340f9907721873a316f4e

diff --git a/units/user@.service.in b/units/user@.service.in
index 91e3b2515..8091ce1a0 100644
--- a/units/user@.service.in
+++ b/units/user@.service.in
@@ -1,19 +1,18 @@
 #  This file is part of systemd.
 #
 #  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
 #  (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
-ControlGroup=%R/user/%I/shared cpu:/
-ControlGroupModify=yes
+User=%i
+PAMName=systemd-user
 Type=notify
 ExecStart=-@rootlibexecdir@/systemd --user
-Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%I/dbus/user_bus_socket
+Slice=user-%i.slice
+KillMode=mixed