diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-03 14:01:37 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-03 14:01:37 +0000 |
| commit | 734d725d62d2cbe4445524448de024e3b9e7f4b3 (patch) | |
| tree | 88d8385f24a0efda248b3480fe39037b85e76552 /modules.d/90crypt | |
| parent | Releasing progress-linux version 060+5-8~progress7.99u1. (diff) | |
| download | dracut-734d725d62d2cbe4445524448de024e3b9e7f4b3.tar.xz dracut-734d725d62d2cbe4445524448de024e3b9e7f4b3.zip | |
Merging upstream version 102.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'modules.d/90crypt')
| -rwxr-xr-x | modules.d/90crypt/module-setup.sh | 32 | ||||
| -rwxr-xr-x | modules.d/90crypt/parse-crypt.sh | 2 |
2 files changed, 2 insertions, 32 deletions
diff --git a/modules.d/90crypt/module-setup.sh b/modules.d/90crypt/module-setup.sh index d5ac45b..8d24825 100755 --- a/modules.d/90crypt/module-setup.sh +++ b/modules.d/90crypt/module-setup.sh @@ -18,21 +18,7 @@ check() { # called by dracut depends() { - local deps - deps="dm rootfs-block" - if [[ $hostonly && -f "$dracutsysrootdir"/etc/crypttab ]]; then - if grep -q -e "fido2-device=" -e "fido2-cid=" "$dracutsysrootdir"/etc/crypttab; then - deps+=" fido2" - fi - if grep -q "pkcs11-uri" "$dracutsysrootdir"/etc/crypttab; then - deps+=" pkcs11" - fi - if grep -q "tpm2-device=" "$dracutsysrootdir"/etc/crypttab; then - deps+=" tpm2-tss" - fi - fi - echo "$deps" - return 0 + echo dm rootfs-block } # called by dracut @@ -160,22 +146,6 @@ install() { inst_simple "$moddir/crypt-lib.sh" "/lib/dracut-crypt-lib.sh" 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 \ - "$tmpfilesdir"/cryptsetup.conf \ - "$systemdutildir"/system-generators/systemd-cryptsetup-generator \ - "$systemdutildir"/systemd-cryptsetup \ - "$systemdsystemunitdir"/systemd-ask-password-console.path \ - "$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 - # Install required libraries. _arch=${DRACUT_ARCH:-$(uname -m)} inst_libdir_file \ diff --git a/modules.d/90crypt/parse-crypt.sh b/modules.d/90crypt/parse-crypt.sh index e46e347..39fc6d2 100755 --- a/modules.d/90crypt/parse-crypt.sh +++ b/modules.d/90crypt/parse-crypt.sh @@ -174,7 +174,7 @@ else } >> "$hookdir/emergency/90-crypt.sh" fi done - elif getargbool 0 rd.auto; then + elif getargbool 1 rd.auto; then if [ -z "$DRACUT_SYSTEMD" ]; then { printf -- 'ENV{ID_FS_TYPE}=="crypto_LUKS", RUN+="%s ' "$(command -v initqueue)" |