[systemd-devel] [PATCH v2] units: user at .service: fix user bus path

[Mantas Mikulėnas]

---
 units/user at .service.in | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/units/user at .service.in b/units/user at .service.in
index 3f8b59d..7b7d52b 100644
--- a/units/user at .service.in
+++ b/units/user at .service.in
@@ -14,5 +14,9 @@ User=%I
 PAMName=systemd-user
 Type=notify
 ExecStart=- at 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
-- 
1.8.5.1.277.g0e0d235