nspawn: figure out cgroup mode *after* mounting image

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

diff --git a/units/user@.service.in b/units/user@.service.in
index 7b7d52b60bacbd97a5b40068ca7f809b4b167219..1cf619a1aef0f518acd2aae3f6b2276e104390c2 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,17 +8,16 @@
 #  (at your option) any later version.
 
 [Unit]
-Description=User Manager for %I
+Description=User Manager for UID %i
 After=systemd-user-sessions.service
 
 [Service]
-User=%I
+User=%i
 PAMName=systemd-user
 Type=notify
 ExecStart=-@rootlibexecdir@/systemd --user
-m4_ifdef(`ENABLE_KDBUS',
-Environment=DBUS_SESSION_BUS_ADDRESS=kernel:path=/dev/kdbus/%I-user/bus;unix:path=/run/user/%I/bus
-,m4_dnl
-Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%I/bus
-)m4_dnl
 Slice=user-%i.slice
+KillMode=mixed
+Delegate=yes
+TasksMax=infinity
+TimeoutStopSec=120s