From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 19 Dec 2019 09:42:14 +0000 (+0100)
Subject: Revert "cryptsetup: umount encrypted devices before detaching it during shutdown"
X-Git-Tag: v245-rc1~226^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4186441bbd912dea9c8a43dfd19dcbea90b4c3a0;p=thirdparty%2Fsystemd.git

Revert "cryptsetup: umount encrypted devices before detaching it during shutdown"

This reverts commit 362c378291e85df3e00aaad491d1e08233ad127f.

This commit introduced an ordering loop: remote-cryptsetup.target was both
before and after remote-fs-pre.target. It also globally ordered all cryptsetup
volumes before all mounts. Such global ordering is problematic if people have
stacked storage. Let's look for a different solution.

See https://github.com/systemd/systemd/pull/14378#discussion_r359460109.
---

diff --git a/man/bootup.xml b/man/bootup.xml
index 55b3eb8a332..d3715234000 100644
--- a/man/bootup.xml
+++ b/man/bootup.xml
@@ -92,24 +92,17 @@
 
     <!-- note: do not use unicode ellipsis here, because docbook will replace that
          with three dots anyway, messing up alignment -->
-<programlisting>(various cryptsetup
-     devices...)
+<programlisting>local-fs-pre.target
          |
          v
-  cryptsetup.target
-         |
-         v
- local-fs-pre.target
-         |
-         v
-(various mounts and   (various swap
- fsck services...)     devices...)                        (various low-level      (various low-level
-         |                  |                              services: udevd,        API VFS mounts:
-         v                  v                              tmpfiles, random        mqueue, configfs,
-  local-fs.target      swap.target                         seed, sysctl, ...)      debugfs, ...)
-         |                  |                                     |                      |
-         \__________________|_________________   _________________|______________________/
-                                              \ /
+(various mounts and   (various swap   (various cryptsetup
+ fsck services...)     devices...)        devices...)       (various low-level   (various low-level
+         |                  |                  |             services: udevd,     API VFS mounts:
+         v                  v                  v             tmpfiles, random     mqueue, configfs,
+  local-fs.target      swap.target     cryptsetup.target    seed, sysctl, ...)      debugfs, ...)
+         |                  |                  |                    |                    |
+         \__________________|_________________ | ___________________|____________________/
+                                              \|/
                                                v
                                         sysinit.target
                                                |
diff --git a/units/local-fs-pre.target b/units/local-fs-pre.target
index e9a1f188bf3..9aca15b9538 100644
--- a/units/local-fs-pre.target
+++ b/units/local-fs-pre.target
@@ -11,4 +11,3 @@
 Description=Local File Systems (Pre)
 Documentation=man:systemd.special(7)
 RefuseManualStart=yes
-After=cryptsetup.target
diff --git a/units/remote-fs-pre.target b/units/remote-fs-pre.target
index b4a68c73dd6..3f22605c8c7 100644
--- a/units/remote-fs-pre.target
+++ b/units/remote-fs-pre.target
@@ -11,4 +11,3 @@
 Description=Remote File Systems (Pre)
 Documentation=man:systemd.special(7)
 RefuseManualStart=yes
-After=remote-cryptsetup.target