From 5bfebf0f04c8e88a0447d5f75c7ec13951fa610d Mon Sep 17 00:00:00 2001

From: Harald Hoyer <harald@redhat.com>

Date: Tue, 7 Apr 2020 22:26:25 +0200

Subject: [PATCH] 90crypt/module-setup.sh: try to catch kernel config changes

If a crypto kernel module changes from compiled in to module, the

encrypted disk might fail to open, because the kernel module was

not included in the initramfs.

This patch tries heuristically to catch such modules.

Fixes https://github.com/dracutdevs/dracut/issues/706

---

 modules.d/90crypt/module-setup.sh | 25 +++++++++++++++++++++++++

 1 file changed, 25 insertions(+)

diff --git a/modules.d/90crypt/module-setup.sh b/modules.d/90crypt/module-setup.sh

index a9dda734..3bce2411 100755

--- a/modules.d/90crypt/module-setup.sh

+++ b/modules.d/90crypt/module-setup.sh

@@ -26,6 +26,31 @@ depends() {

 installkernel() {

     hostonly="" instmods drbg

     instmods dm_crypt

+

+    # in case some of the crypto modules moved from compiled in

+    # to module based, try to install those modules

+    # best guess

+    [[ $hostonly ]] || [[ $mount_needs ]] && {

+        # dmsetup returns s.th. like

+        # cryptvol: 0 2064384 crypt aes-xts-plain64 :64:logon:cryptsetup:....

+        dmsetup table | while read name _ _ is_crypt cipher _; do

+            [[ $is_crypt != "crypt" ]] && continue

+            # get the device name

+            name=/dev/$(dmsetup info -c --noheadings -o blkdevname ${name%:})

+            # check if the device exists as a key in our host_fs_types

+            if [[ ${host_fs_types[$name]+_} ]]; then

+                # split the cipher aes-xts-plain64 in pieces

+                _OLD_IFS=$IFS

+                IFS='-:'

+                set -- $cipher

+                IFS=$_OLD_IFS

+                # try to load the cipher part with "crypto-" prepended

+                # in non-hostonly mode

+                hostonly= instmods $(for k in "$@"; do echo "crypto-$k";done)

+            fi

+        done

+    }

+    return 0

 }

 # called by dracut