diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-12-19 10:42:14 +0100 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-12-19 10:42:14 +0100 |
commit | 4186441bbd912dea9c8a43dfd19dcbea90b4c3a0 (patch) | |
tree | 120d01cbd0d3690652e46d03c244c4dc56d45fce /man/bootup.xml | |
parent | 7a670b1dd981c645064f69faf85b04620aadbafb (diff) | |
download | systemd-4186441bbd912dea9c8a43dfd19dcbea90b4c3a0.tar.gz |
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.
Diffstat (limited to 'man/bootup.xml')
-rw-r--r-- | man/bootup.xml | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/man/bootup.xml b/man/bootup.xml index 55b3eb8a33..d371523400 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 | |