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 ece671d4485f71be6e120bb6f897075ec84fe9a8..7b7d52b60bacbd97a5b40068ca7f809b4b167219 100644 (file)
--- a/units/user@.service.in
+++ b/units/user@.service.in
@@ -11,13 +11,12 @@ After=systemd-user-sessions.service
 
 [Service]
 User=%I
-PAMName=systemd-shared
-# in order to allow MEM_CG features to work, add "memory:/" here
-ControlGroup=%R/user/%U.user/shared cpu:/
-ControlGroupModify=yes
+PAMName=systemd-user
 Type=notify
 ExecStart=-@rootlibexecdir@/systemd --user
-Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%U/dbus/user_bus_socket
-
-[Install]
-Alias=user@%i.service
+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