Adding upstream version 256.upstream/256

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 17 insertions, 2 deletions

diff --git a/units/user-runtime-dir@.service.in b/units/user-runtime-dir@.service.in
index 0641dd0..5fb5cad 100644
--- a/units/user-runtime-dir@.service.in
+++ b/units/user-runtime-dir@.service.in
@@ -11,7 +11,6 @@
 Description=User Runtime Directory /run/user/%i
 Documentation=man:user@.service(5)
 After=dbus.service
-StopWhenUnneeded=yes
 IgnoreOnIsolate=yes
 
 [Service]
diff --git a/units/user/capsule@.target b/units/user/capsule@.target
new file mode 100644
index 0000000..986e3ad
--- /dev/null
+++ b/units/user/capsule@.target
@@ -0,0 +1,15 @@
+#  SPDX-License-Identifier: LGPL-2.1-or-later
+#
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  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]
+Description=Main Capsule Target for %i
+Documentation=man:systemd.special(7)
+Requires=basic.target
+After=basic.target
+AllowIsolate=yes
diff --git a/units/user/meson.build b/units/user/meson.build
index 850ac2c..21070f7 100644
--- a/units/user/meson.build
+++ b/units/user/meson.build
@@ -5,6 +5,7 @@ units = [
         'background.slice',
         'basic.target',
         'bluetooth.target',
+        'capsule@.target',
         'default.target',
         'exit.target',
         'graphical-session-pre.target',
diff --git a/units/user@.service.in b/units/user@.service.in
index da5f98c..5efb12a 100644
--- a/units/user@.service.in
+++ b/units/user@.service.in
@@ -10,8 +10,8 @@
 [Unit]
 Description=User Manager for UID %i
 Documentation=man:user@.service(5)
+BindsTo=user-runtime-dir@%i.service
 After=user-runtime-dir@%i.service dbus.service systemd-oomd.service
-Requires=user-runtime-dir@%i.service
 IgnoreOnIsolate=yes
 
 [Service]