shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-23 21:35:11 +03:00
Code

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

Browse Source 
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
This commit is contained in:
Lennart Poettering 2016-02-09 20:34:27 +01:00
parent 114400dfb3
commit 8222cf9145
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
units/basic.target
View File

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