chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 2c154953b18dc74fb1668236d23f29ec283b482c..ece671d4485f71be6e120bb6f897075ec84fe9a8 100644
(file)
--- a/
units/user@.service.in
+++ b/
units/user@.service.in
@@
-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