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 55b3eb8a332ce488ba96f7a749135aaa38b9c571..d3715234000365fa89efd252c9e3f94c1dd7894b 100644 (file)
--- 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 e9a1f188bf369e7140a302a96bd4d2c040822cce..9aca15b95381f9d1dc011cfd56d53c42c37a1ca6 100644 (file)
--- 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 b4a68c73dd64a2ba12aaedd223298100582593e9..3f22605c8c7c2d48996092c46bf37afa44180bef 100644 (file)
--- 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