diff options
| author | Mike Yuan <me@yhndnzj.com> | 2023-09-27 00:26:38 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2023-09-27 12:33:40 +0200 |
| commit | 99f360a46b6304d87a483be8e09d5e5176be13aa (patch) | |
| tree | 158c2ea9a3ee9e9fac18ddaaa4a1f5c8eaddec93 /units | |
| parent | ndisc: Also set link hoplimit (diff) | |
| download | systemd-99f360a46b6304d87a483be8e09d5e5176be13aa.tar.xz systemd-99f360a46b6304d87a483be8e09d5e5176be13aa.zip | |
units/blockdev@.target: conflict with umount.target
Follow-up for d120ce478dc0043c89899799b5c1aaf62901bea9
blockdev@.target is used as a synchronization point between
the mount unit and corresponding systemd-cryptsetup@.service.
After the mentioned commit, it doesn't get a stop job enqueued
during shutdown, and thus the stop job for systemd-cryptsetup@.service
could be run before the mount unit is stopped.
Therefore, let's make blockdev@.target conflict with umount.target,
which is also what systemd-cryptsetup@.service does.
Fixes #29336
Diffstat (limited to 'units')
| -rw-r--r-- | units/blockdev@.target | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/units/blockdev@.target b/units/blockdev@.target index 1c86506351..f4034d30a5 100644 --- a/units/blockdev@.target +++ b/units/blockdev@.target @@ -10,5 +10,9 @@ [Unit] Description=Block Device Preparation for %f Documentation=man:systemd.special(7) + DefaultDependencies=no +Conflicts=umount.target +Before=umount.target + StopWhenUnneeded=yes |