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=8091ce1a0ba6bb4d3ebf56d00dc426e7df4e3a88;hp=7b7d52b60bacbd97a5b40068ca7f809b4b167219;hb=3a0efd7030af9d08a791626ace940805aeafd565;hpb=3dc9f55d6ef15028468eb7179ff8e97b95acd15d

diff --git a/units/user@.service.in b/units/user@.service.in
index 7b7d52b60..8091ce1a0 100644
--- a/units/user@.service.in
+++ b/units/user@.service.in
@@ -6,17 +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
+User=%i
 PAMName=systemd-user
 Type=notify
 ExecStart=-@rootlibexecdir@/systemd --user
-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
+KillMode=mixed