X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=units%2Fuser%40.service.in;h=ece671d4485f71be6e120bb6f897075ec84fe9a8;hp=59fe5242d6a77a1956c090ed52aa0d305511de92;hb=9541fe6adff9941e487084c718ff2d46ed2929c6;hpb=bde7f9072109aaf298fe35de59a61b1eb026bf51;ds=sidebyside diff --git a/units/user@.service.in b/units/user@.service.in index 59fe5242d..ece671d44 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,8 +12,12 @@ After=systemd-user-sessions.service [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=-@rootbindir@/systemd --user -Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%I/dbus/user_bus_socket +ExecStart=-@rootlibexecdir@/systemd --user +Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%U/dbus/user_bus_socket + +[Install] +Alias=user@%i.service