Install crypto modules in 90kernel-modules

We don't want to play catch up with hash and encryption algorithms.
To be safe, just use the hammer and include all crypto.

Fixes https://github.com/dracutdevs/dracut/issues/802
master
Harald Hoyer 2020-04-24 11:05:49 +02:00 committed by Harald Hoyer
parent faea4e4ddb
commit 586a56c287
3 changed files with 10 additions and 7 deletions

View File

@ -26,8 +26,6 @@ depends() {
# called by dracut # called by dracut
installkernel() { installkernel() {
instmods btrfs instmods btrfs
# Make sure btfs can use fast crc32c implementations where available (bsc#1011554)
instmods crc32c-intel
} }


# called by dracut # called by dracut

View File

@ -25,11 +25,7 @@ depends() {
# called by dracut # called by dracut
installkernel() { installkernel() {
hostonly="" instmods drbg hostonly="" instmods drbg
arch=$(uname -m) instmods dm_crypt
[[ $arch == x86_64 ]] && arch=x86
[[ $arch == s390x ]] && arch=s390
[[ $arch == aarch64 ]] && arch=arm64
instmods dm_crypt =crypto =drivers/crypto =arch/$arch/crypto
} }


# called by dracut # called by dracut

View File

@ -104,6 +104,15 @@ installkernel() {
elif [[ "${host_fs_types[*]}" ]]; then elif [[ "${host_fs_types[*]}" ]]; then
hostonly='' instmods "${host_fs_types[@]}" hostonly='' instmods "${host_fs_types[@]}"
fi fi

arch=${DRACUT_ARCH:-$(uname -m)}

# We don't want to play catch up with hash and encryption algorithms.
# To be safe, just use the hammer and include all crypto.
[[ $arch == x86_64 ]] && arch=x86
[[ $arch == s390x ]] && arch=s390
[[ $arch == aarch64 ]] && arch=arm64
instmods "=crypto" "=arch/$arch/crypto" "=drivers/crypto"
fi fi
: :
} }