From a23a4680e7d04d1016e9d5e4b53b1e65f1ca98aa Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Thu, 12 Nov 2020 11:27:39 -0500 Subject: [PATCH] 90crypt: pull in remote-cryptsetup.target enablement This should've been part of #964. As mentioned there, the `initrd-cryptsetup.target` approach was reverted in the end, and we went back to relying in `remote-cryptsetup.target`: https://github.com/systemd/systemd/pull/17467 So we do need to ship the enablement symlink for it. --- modules.d/90crypt/module-setup.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules.d/90crypt/module-setup.sh b/modules.d/90crypt/module-setup.sh index e3d6338f..58e5f34e 100755 --- a/modules.d/90crypt/module-setup.sh +++ b/modules.d/90crypt/module-setup.sh @@ -144,6 +144,8 @@ install() { inst_script "$moddir/crypt-run-generator.sh" "/sbin/crypt-run-generator" if dracut_module_included "systemd"; then + # the cryptsetup targets are already pulled in by 00systemd, but not + # the enablement symlinks inst_multiple -o \ $systemdutildir/system-generators/systemd-cryptsetup-generator \ $systemdutildir/systemd-cryptsetup \ @@ -151,6 +153,8 @@ install() { $systemdsystemunitdir/systemd-ask-password-console.service \ $systemdsystemunitdir/cryptsetup.target \ $systemdsystemunitdir/sysinit.target.wants/cryptsetup.target \ + $systemdsystemunitdir/remote-cryptsetup.target \ + $systemdsystemunitdir/initrd-root-device.target.wants/remote-cryptsetup.target \ systemd-ask-password systemd-tty-ask-password-agent fi