From: Jonathan Lebon <jonathan@jlebon.com>
Date: Tue, 20 Oct 2020 20:41:00 +0000 (-0400)
Subject: 90crypt: ship initrd-cryptsetup.target
X-Git-Tag: 051~44
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8f56daa8c3c75b167823286553f223e5b46cd6ab;p=thirdparty%2Fdracut.git

90crypt: ship initrd-cryptsetup.target

This was added in https://github.com/systemd/systemd/pull/17149 and is
the designated cryptsetup target for all encrypted volumes that need to
be opened in the initrd.

So it effectively replaces `cryptsetup.target` and
`remote-cryptsetup.target` there. I've removed the latter since it was
added recently (by me) in #930, but kept `cryptsetup.target` since we've
been shipping it for a long time now.
---

diff --git a/modules.d/00systemd/module-setup.sh b/modules.d/00systemd/module-setup.sh
index bbce31a28..29485375a 100755
--- a/modules.d/00systemd/module-setup.sh
+++ b/modules.d/00systemd/module-setup.sh
@@ -66,7 +66,6 @@ install() {
         \
         $systemdsystemunitdir/cryptsetup.target \
         $systemdsystemunitdir/cryptsetup-pre.target \
-        $systemdsystemunitdir/remote-cryptsetup.target \
         $systemdsystemunitdir/emergency.target \
         $systemdsystemunitdir/sysinit.target \
         $systemdsystemunitdir/basic.target \
diff --git a/modules.d/90crypt/module-setup.sh b/modules.d/90crypt/module-setup.sh
index e3d6338f1..3deee65ed 100755
--- a/modules.d/90crypt/module-setup.sh
+++ b/modules.d/90crypt/module-setup.sh
@@ -151,6 +151,8 @@ install() {
                       $systemdsystemunitdir/systemd-ask-password-console.service \
                       $systemdsystemunitdir/cryptsetup.target \
                       $systemdsystemunitdir/sysinit.target.wants/cryptsetup.target \
+                      $systemdsystemunitdir/initrd-cryptsetup.target \
+                      $systemdsystemunitdir/sysinit.target.wants/initrd-cryptsetup.target \
                       systemd-ask-password systemd-tty-ask-password-agent
     fi