units: downgrade dependency on /tmp in basic.target to Wants=

Now that requiring of a masked unit results in failure again, downgrade the dependency on /tmp to Wants= again, so that
our suggested way to disable /tmp-on-tmpfs by masking doesn't result in a failing boot.

References: #2315

diff --git a/units/basic.target b/units/basic.target
index e0e1e604f81d54b57b646c67dce559399abd2837..7f1f829c3624ad8ce3d4db4f243338a36b2982f6 100644 (file)
--- a/units/basic.target
+++ b/units/basic.target
@@ -10,8 +10,10 @@ Description=Basic System
 Documentation=man:systemd.special(7)
 Requires=sysinit.target
 Wants=sockets.target timers.target paths.target slices.target
-After=sysinit.target sockets.target paths.target slices.target
+After=sysinit.target sockets.target paths.target slices.target tmp.mount
 
-# We support /var, /tmp, /var/tmp, being on NFS, but we don't pull in
-# remote-fs.target by default, hence explicitly pull /var in here.
-RequiresMountsFor=/var /tmp /var/tmp
+# We support /var, /tmp, /var/tmp, being on NFS, but we don't pull in remote-fs.target by default, hence pull them in
+# explicitly here. Note that we require /var and /var/tmp, but only add a Wants= type dependency on /tmp, as we support
+# that unit being masked, and this should not be considered an error.
+RequiresMountsFor=/var /var/tmp
+Wants=tmp.mount