summaryrefslogtreecommitdiff
path: root/units
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-02-09 19:08:16 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-02-09 19:13:15 -0500
commit9c6d5a179e0e59d3d6eb6a5ad281d88af62d2058 (patch)
treec6b903f362e683baa105c2d779f9011cb6e0abd4 /units
parentbae687d885dc9df257a23ab6aab08c579190fd53 (diff)
parentb21d2f8117e41753aeeb384dfafa92ee97a6c7b8 (diff)
Merge pull request #2565 from poettering/fix-2315
Diffstat (limited to 'units')
-rw-r--r--units/basic.target9
1 files changed, 6 insertions, 3 deletions
diff --git a/units/basic.target b/units/basic.target
index e0e1e604f8..3e3527f894 100644
--- a/units/basic.target
+++ b/units/basic.target
@@ -10,8 +10,11 @@ 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
+# 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