From 3dc9f55d6ef15028468eb7179ff8e97b95acd15d Mon Sep 17 00:00:00 2001
From: Mantas Mikulėnas <grawity@gmail.com>
Date: Fri, 27 Dec 2013 17:10:36 +0200
Subject: units: user@.service: fix user bus path

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

(limited to 'units')

diff --git a/units/user@.service.in b/units/user@.service.in
index 3f8b59d07f..7b7d52b60b 100644
--- 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
-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
-- 
cgit v1.2.3-54-g00ecf