From d28f91126a6d76503155e462b4e9f1a052f412ad Mon Sep 17 00:00:00 2001 From: Antonio Alvarez Feijoo Date: Mon, 14 Aug 2023 12:28:11 +0200 Subject: [PATCH] fix(dracut.sh): remove microcode check based on CONFIG_MICROCODE_[AMD|INTEL] `CONFIG_MICROCODE_AMD` and `CONFIG_MICROCODE_INTEL` are hidden since https://lore.kernel.org/all/20230810160805.081212701@linutronix.de/, therefore this check is wrong and early microcode is always disabled. (Cherry-picked commit: 61b9cd16e049434597e398be61a47e0112382c5b) Resolves: RHEL-21023 --- dracut.sh | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dracut.sh b/dracut.sh index 869b90b0..42e1650a 100755 --- a/dracut.sh +++ b/dracut.sh @@ -1084,23 +1084,20 @@ fi if [[ $early_microcode = yes ]]; then if [[ $hostonly ]]; then - if [[ $(get_cpu_vendor) == "AMD" ]]; then - check_kernel_config CONFIG_MICROCODE_AMD || unset early_microcode - elif [[ $(get_cpu_vendor) == "Intel" ]]; then - check_kernel_config CONFIG_MICROCODE_INTEL || unset early_microcode + if [[ $(get_cpu_vendor) == "AMD" || $(get_cpu_vendor) == "Intel" ]]; then + check_kernel_config CONFIG_MICROCODE || unset early_microcode else unset early_microcode fi else - ! check_kernel_config CONFIG_MICROCODE_AMD \ - && ! check_kernel_config CONFIG_MICROCODE_INTEL \ + ! check_kernel_config CONFIG_MICROCODE \ && unset early_microcode fi # Do not complain on non-x86 architectures as it makes no sense case $(uname -m) in x86_64|i?86) [[ $early_microcode != yes ]] \ - && dwarn "Disabling early microcode, because kernel does not support it. CONFIG_MICROCODE_[AMD|INTEL]!=y" + && dwarn "Disabling early microcode, because kernel does not support it. CONFIG_MICROCODE!=y" ;; *) ;; esac