diff --git a/0051.patch b/0051.patch new file mode 100644 index 0000000..329f421 --- /dev/null +++ b/0051.patch @@ -0,0 +1,49 @@ +From 4a93a6e1dab779b05f3f68c6d803a6f24dc44a02 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-17902 +--- + dracut.sh | 11 ++++------- + 1 file changed, 4 insertions(+), 7 deletions(-) + +diff --git a/dracut.sh b/dracut.sh +index 0bac6a33..778eefd7 100755 +--- a/dracut.sh ++++ b/dracut.sh +@@ -1489,23 +1489,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 diff --git a/dracut.spec b/dracut.spec index 52a1e09..dff886f 100644 --- a/dracut.spec +++ b/dracut.spec @@ -5,7 +5,7 @@ # strip the automatically generated dep here and instead co-own the # directory. %global __requires_exclude pkg-config -%define dist_free_release 51.git20231115 +%define dist_free_release 52.git20231207 Name: dracut Version: 057 @@ -79,6 +79,7 @@ Patch47: 0047.patch Patch48: 0048.patch Patch49: 0049.patch Patch50: 0050.patch +Patch51: 0051.patch Source1: https://www.gnu.org/licenses/lgpl-2.1.txt @@ -530,6 +531,9 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %{_prefix}/lib/kernel/install.d/51-dracut-rescue.install %changelog +* Thu Dec 07 2023 Pavel Valena - 057-52.git20231207 +- fix(dracut.sh): remove microcode check based on + * Wed Nov 15 2023 Pavel Valena - 057-51.git20231115 - fix(nvmf): move /etc/nvme/host{nqn,id} requirement to