bootctl: log message tweaks

[thirdparty/systemd.git] / units / user@.service.in

diff --git a/units/user@.service.in b/units/user@.service.in
index ece671d4485f71be6e120bb6f897075ec84fe9a8..e898b3978308c03625ab2cd846ca9b73bb14dbd2 100644 (file)
--- a/units/user@.service.in
+++ b/units/user@.service.in
@@ -1,3 +1,5 @@
+#  SPDX-License-Identifier: LGPL-2.1+
+#
 #  This file is part of systemd.
 #
 #  systemd is free software; you can redistribute it and/or modify it
@@ -6,18 +8,20 @@
 #  (at your option) any later version.
 
 [Unit]
-Description=User Manager for %I
-After=systemd-user-sessions.service
+Description=User Manager for UID %i
+Documentation=man:user@.service(5)
+After=systemd-user-sessions.service user-runtime-dir@%i.service dbus.service
+Requires=user-runtime-dir@%i.service
+IgnoreOnIsolate=yes
 
 [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
-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=pids memory
+TasksMax=infinity
+TimeoutStopSec=120s
+KeyringMode=inherit