From: Mantas Mikulėnas <grawity@gmail.com>
Date: Fri, 27 Dec 2013 15:10:36 +0000 (+0200)
Subject: units: user@.service: fix user bus path
X-Git-Tag: v209~613
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3dc9f55d6ef15028468eb7179ff8e97b95acd15d;p=thirdparty%2Fsystemd.git

units: user@.service: fix user bus path
---

diff --git a/units/user@.service.in b/units/user@.service.in
index 3f8b59d07fe..7b7d52b60ba 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