systemctl does not expand %u, so revert back to %I

[elogind.git] / units / user@.service.in

diff --git a/units/user@.service.in b/units/user@.service.in
index 91e3b2515836827750eef478a9c2787d3212f0dc..ece671d4485f71be6e120bb6f897075ec84fe9a8 100644 (file)
--- 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
 #  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]
 #  (at your option) any later version.
 
 [Unit]


@@ -12,8 +12,12 @@ After=systemd-user-sessions.service
 [Service]
 User=%I
 PAMName=systemd-shared
 [Service]
 User=%I
 PAMName=systemd-shared

-ControlGroup=%R/user/%I/shared cpu:/
+# in order to allow MEM_CG features to work, add "memory:/" here
+ControlGroup=%R/user/%U.user/shared cpu:/

 ControlGroupModify=yes
 Type=notify
 ExecStart=-@rootlibexecdir@/systemd --user
 ControlGroupModify=yes
 Type=notify
 ExecStart=-@rootlibexecdir@/systemd --user

-Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%I/dbus/user_bus_socket
+Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%U/dbus/user_bus_socket
+
+[Install]
+Alias=user@%i.service