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=7b7d52b60bacbd97a5b40068ca7f809b4b167219;hp=2c154953b18dc74fb1668236d23f29ec283b482c;hb=3dc9f55d6ef15028468eb7179ff8e97b95acd15d;hpb=f274ece0f76b5709408821e317e87aef76123db6

diff --git a/units/user@.service.in b/units/user@.service.in
index 2c154953b..7b7d52b60 100644
--- a/units/user@.service.in
+++ b/units/user@.service.in
@@ -11,9 +11,12 @@ After=systemd-user-sessions.service
 
 [Service]
 User=%I
-PAMName=systemd-shared
-ControlGroup=%R/user/%I/shared cpu:/
-ControlGroupModify=yes
+PAMName=systemd-user
 Type=notify
 ExecStart=-@rootlibexecdir@/systemd --user
-Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%I/dbus/user_bus_socket
+m4_ifdef(`ENABLE_KDBUS',
+Environment=DBUS_SESSION_BUS_ADDRESS=kernel:path=/dev/kdbus/%I-user/bus;unix:path=/run/user/%I/bus
+,m4_dnl
+Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%I/bus
+)m4_dnl
+Slice=user-%i.slice