chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
units: user@.service: fix user bus path
[elogind.git]
/
units
/
user@.service.in
diff --git
a/units/user@.service.in
b/units/user@.service.in
index 2c154953b18dc74fb1668236d23f29ec283b482c..7b7d52b60bacbd97a5b40068ca7f809b4b167219 100644
(file)
--- a/
units/user@.service.in
+++ b/
units/user@.service.in
@@
-11,9
+11,12
@@
After=systemd-user-sessions.service
[Service]
User=%I
[Service]
User=%I
-PAMName=systemd-shared
-ControlGroup=%R/user/%I/shared cpu:/
-ControlGroupModify=yes
+PAMName=systemd-user
Type=notify
ExecStart=-@rootlibexecdir@/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