kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
master
Jonathan Lebon 2020-11-12 11:27:39 -05:00 committed by Daniel Molkentin
parent 0f89c0dff6
commit a23a4680e7
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules.d/90crypt/module-setup.sh
View File

@ -144,6 +144,8 @@ install() {
inst_script "$moddir/crypt-run-generator.sh" "/sbin/crypt-run-generator" inst_script "$moddir/crypt-run-generator.sh" "/sbin/crypt-run-generator"


if dracut_module_included "systemd"; then if dracut_module_included "systemd"; then
# the cryptsetup targets are already pulled in by 00systemd, but not
# the enablement symlinks
inst_multiple -o \ inst_multiple -o \
$systemdutildir/system-generators/systemd-cryptsetup-generator \ $systemdutildir/system-generators/systemd-cryptsetup-generator \
$systemdutildir/systemd-cryptsetup \ $systemdutildir/systemd-cryptsetup \
@ -151,6 +153,8 @@ install() {
$systemdsystemunitdir/systemd-ask-password-console.service \ $systemdsystemunitdir/systemd-ask-password-console.service \
$systemdsystemunitdir/cryptsetup.target \ $systemdsystemunitdir/cryptsetup.target \
$systemdsystemunitdir/sysinit.target.wants/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 systemd-ask-password systemd-tty-ask-password-agent
fi fi