From: Jonathan Lebon <jonathan@jlebon.com>
Date: Wed, 28 Oct 2020 13:13:34 +0000 (-0400)
Subject: Revert "90crypt: ship initrd-cryptsetup.target"
X-Git-Tag: 051~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09804a46294ce67c211d4188ce154c2f4b7fb234;p=thirdparty%2Fdracut.git

Revert "90crypt: ship initrd-cryptsetup.target"

This reverts commit 8f56daa8c3c75b167823286553f223e5b46cd6ab.

The addition of `initrd-cryptsetup.target` was reverted in systemd:
https://github.com/systemd/systemd/pull/17467
---

diff --git a/modules.d/00systemd/module-setup.sh b/modules.d/00systemd/module-setup.sh
index 29485375a..bbce31a28 100755
--- a/modules.d/00systemd/module-setup.sh
+++ b/modules.d/00systemd/module-setup.sh
@@ -66,6 +66,7 @@ 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 3deee65ed..e3d6338f1 100755
--- a/modules.d/90crypt/module-setup.sh
+++ b/modules.d/90crypt/module-setup.sh
@@ -151,8 +151,6 @@ 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