From: Mike Yuan <me@yhndnzj.com>
Date: Tue, 26 Sep 2023 22:26:38 +0000 (+0800)
Subject: units/blockdev@.target: conflict with umount.target
X-Git-Tag: v255-rc1~416
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=99f360a46b6304d87a483be8e09d5e5176be13aa;p=thirdparty%2Fsystemd.git

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
---

diff --git a/units/blockdev@.target b/units/blockdev@.target
index 1c865063513..f4034d30a50 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