chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
units: restore job timeouts for poweroff and reboot
[elogind.git]
/
units
/
user@.service.in
diff --git
a/units/user@.service.in
b/units/user@.service.in
index 3cf1347b16c95a1b777222d043d05eb438c2add2..1e21d51aaef5b1833577b6bd2db6c2536bc87898 100644
(file)
--- a/
units/user@.service.in
+++ b/
units/user@.service.in
@@
-6,18
+6,14
@@
# (at your option) any later version.
[Unit]
# (at your option) any later version.
[Unit]
-Description=User Manager for
%u
+Description=User Manager for
UID %i
After=systemd-user-sessions.service
[Service]
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
+User=%i
+PAMName=systemd-user
Type=notify
ExecStart=-@rootlibexecdir@/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
+Slice=user-%i.slice
+KillMode=mixed
+Delegate=yes