diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-10-27 13:26:01 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-10-27 13:36:22 +0100 |
| commit | 6bdcb72086b681a0d42521169fdadb65ef2ac539 (patch) | |
| tree | c0b45576efe3afe073fbc9437b9a6429f6f22caa /man/systemd.special.xml | |
| parent | d5816b6138be788f3d3ea72359bb28dc239c3235 (diff) | |
| download | systemd-6bdcb72086b681a0d42521169fdadb65ef2ac539.tar.gz | |
Revert "units: add initrd-cryptsetup.target"
This reverts commit 6c5496c492a8d74e54d22bf8824160cab1e63c10.
sysinit.target is shared between the initrd and the host system. Pulling in
initrd-cryptsetup.target into sysinit.target causes the following warning at
boot:
Oct 27 10:42:30 workstation-uefi systemd[1]: initrd-cryptsetup.target: Starting requested but asserts failed.
Oct 27 10:42:30 workstation-uefi systemd[1]: Assertion failed for initrd-cryptsetup.target.
Diffstat (limited to 'man/systemd.special.xml')
| -rw-r--r-- | man/systemd.special.xml | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/man/systemd.special.xml b/man/systemd.special.xml index fe40da7fbe..1434ead7d5 100644 --- a/man/systemd.special.xml +++ b/man/systemd.special.xml @@ -41,7 +41,6 @@ <filename>hybrid-sleep.target</filename>, <filename>suspend-then-hibernate.target</filename>, <filename>initrd.target</filename>, - <filename>initrd-cryptsetup.target</filename>, <filename>initrd-fs.target</filename>, <filename>initrd-root-device.target</filename>, <filename>initrd-root-fs.target</filename>, @@ -183,10 +182,8 @@ <varlistentry> <term><filename>cryptsetup.target</filename></term> <listitem> - <para>A target that pulls in setup services for local encrypted block devices. - See <filename>remote-cryptsetup.target</filename> below for the equivalent target for remote - volumes, and <filename>initrd-cryptsetup.target</filename> below for the equivalent target in the - initrd.</para> + <para>A target that pulls in setup services for all + encrypted block devices.</para> </listitem> </varlistentry> <varlistentry> @@ -355,21 +352,13 @@ <varlistentry> <term><filename>initrd.target</filename></term> <listitem> - <para>This is the default target in the initrd, similar to <filename>default.target</filename> + <para>This is the default target in the initramfs, similar to <filename>default.target</filename> in the main system. It is used to mount the real root and transition to it. See <citerefentry><refentrytitle>bootup</refentrytitle><manvolnum>7</manvolnum></citerefentry> for more discussion.</para> </listitem> </varlistentry> <varlistentry> - <term><filename>initrd-cryptsetup.target</filename></term> - <listitem> - <para>A target that pulls in setup services for all encrypted block devices. See - <filename>cryptsetup.target</filename> and <filename>remote-cryptsetup.target</filename> for the - equivalent targets in the real root.</para> - </listitem> - </varlistentry> - <varlistentry> <term><filename>initrd-fs.target</filename></term> <listitem> <para><citerefentry><refentrytitle>systemd-fstab-generator</refentrytitle><manvolnum>3</manvolnum></citerefentry> @@ -560,9 +549,7 @@ <para>Similar to <filename>cryptsetup.target</filename>, but for encrypted devices which are accessed over the network. It is used for <citerefentry><refentrytitle>crypttab</refentrytitle><manvolnum>8</manvolnum></citerefentry> - entries marked with <option>_netdev</option>. - See <filename>cryptsetup.target</filename> for the equivalent target for local volumes, and - <filename>initrd-cryptsetup.target</filename> for the equivalent target in the initrd.</para> + entries marked with <option>_netdev</option>.</para> </listitem> </varlistentry> <varlistentry> |