X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=units%2Fuser%40.service.m4.in;h=1e21d51aaef5b1833577b6bd2db6c2536bc87898;hb=ff0af2a1660bb122f29713c9b2aff8179f165bb7;hp=7b7d52b60bacbd97a5b40068ca7f809b4b167219;hpb=4acbce79798347cddf1e1d42e9be571e0a041873;p=elogind.git

diff --git a/units/user@.service.m4.in b/units/user@.service.m4.in
index 7b7d52b60..1e21d51aa 100644
--- a/units/user@.service.m4.in
+++ b/units/user@.service.m4.in
@@ -6,17 +6,14 @@
 #  (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
+Delegate=yes