X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=units%2Fuser%40.service.in;h=2c154953b18dc74fb1668236d23f29ec283b482c;hp=d692c8ece8f51bb71f8af7dc1258a8b36b1f6b31;hb=ed061a8dc2acd93c2eb569d2d983d5a77f7e5b77;hpb=d42d27ead91e470cb12986d928441e56c0f543ca

diff --git a/units/user@.service.in b/units/user@.service.in
index d692c8ece..2c154953b 100644
--- a/units/user@.service.in
+++ b/units/user@.service.in
@@ -1,8 +1,8 @@
 #  This file is part of systemd.
 #
 #  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
 #  (at your option) any later version.
 
 [Unit]
@@ -12,7 +12,8 @@ After=systemd-user-sessions.service
 [Service]
 User=%I
 PAMName=systemd-shared
-ControlGroup=/user/%I/shared
+ControlGroup=%R/user/%I/shared cpu:/
 ControlGroupModify=yes
 Type=notify
-ExecStart=-@rootbindir@/systemd --user
+ExecStart=-@rootlibexecdir@/systemd --user
+Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%I/dbus/user_bus_socket