diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-02-09 20:34:27 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2016-02-09 20:34:27 +0100 |
| commit | 8222cf91451e64095c29b2918d2bb5b394c17800 (patch) | |
| tree | 5f869226b127989474af04d9293d83bf844a232b /units | |
| parent | 114400dfb37f5e34985060b925fbaed7a9f01ac8 (diff) | |
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
Diffstat (limited to 'units')
| -rw-r--r-- | units/basic.target | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/units/basic.target b/units/basic.target index e0e1e604f8..7f1f829c36 100644 --- 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 |