units: user@.service: fix user bus path

diff --git a/units/user@.service.in b/units/user@.service.in
index 3f8b59d07fee6abb87e5af861ab8fa9446eb4564..7b7d52b60bacbd97a5b40068ca7f809b4b167219 100644 (file)
--- a/units/user@.service.in
+++ b/units/user@.service.in
@@ -14,5 +14,9 @@ User=%I
 PAMName=systemd-user
 Type=notify
 ExecStart=-@rootlibexecdir@/systemd --user
 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
 Slice=user-%i.slice