summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMantas MikulÄ—nas <grawity@gmail.com>2013-12-27 17:10:36 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-12-27 12:12:41 -0500
commit3dc9f55d6ef15028468eb7179ff8e97b95acd15d (patch)
tree5d15ad94c4dcfcc52171d6e0e420e76807cac4fa
parente9b1d28de3c4f77aa0e30448fc2665915c4f2142 (diff)
units: user@.service: fix user bus path
-rw-r--r--units/user@.service.in6
1 files changed, 5 insertions, 1 deletions
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