diff options
| author | Lennart Poettering <lennart@poettering.net> | 2018-11-26 17:38:52 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2018-11-26 22:18:16 +0100 |
| commit | ff9bf8d01222fe28f89392a0ab17e2a96ea22da5 (patch) | |
| tree | 1f6542e68f2037a6b11e00bb26e1627ce935eacb /units | |
| parent | 020b39497a2a9f6699e984aa473753486d76e01d (diff) | |
| download | systemd-ff9bf8d01222fe28f89392a0ab17e2a96ea22da5.tar.gz | |
units: make fsck/grows/makefs/makeswap units conflict against shutdown.target
They are the only units we shipped/generated where this was missing really. Let's fix these.
Follow-up for: #10933
Diffstat (limited to 'units')
| -rw-r--r-- | units/systemd-fsck-root.service.in | 1 | ||||
| -rw-r--r-- | units/systemd-fsck@.service.in | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/units/systemd-fsck-root.service.in b/units/systemd-fsck-root.service.in index 25aca1943f..042081ccee 100644 --- a/units/systemd-fsck-root.service.in +++ b/units/systemd-fsck-root.service.in @@ -11,6 +11,7 @@ Description=File System Check on Root Device Documentation=man:systemd-fsck-root.service(8) DefaultDependencies=no +Conflicts=shutdown.target Before=local-fs.target shutdown.target ConditionPathIsReadWrite=!/ diff --git a/units/systemd-fsck@.service.in b/units/systemd-fsck@.service.in index 078edcc01a..332208352d 100644 --- a/units/systemd-fsck@.service.in +++ b/units/systemd-fsck@.service.in @@ -12,6 +12,7 @@ Description=File System Check on %f Documentation=man:systemd-fsck@.service(8) DefaultDependencies=no BindsTo=%i.device +Conflicts=shutdown.target After=%i.device systemd-fsck-root.service local-fs-pre.target Before=systemd-quotacheck.service shutdown.target |