picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This reverts commit 362c378291.

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.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2019-12-19 10:42:14 +01:00
parent 7a670b1dd9
commit 4186441bbd
3 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
man/bootup.xml
View File

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

1
units/local-fs-pre.target
View File

@ -11,4 +11,3 @@
Description=Local File Systems (Pre)
Documentation=man:systemd.special(7)
RefuseManualStart=yes
After=cryptsetup.target

1
units/remote-fs-pre.target
View File

@ -11,4 +11,3 @@
Description=Remote File Systems (Pre)
Documentation=man:systemd.special(7)
RefuseManualStart=yes
After=remote-cryptsetup.target