webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

dracut: fix early_microcode put into ramdisk

Browse Source 
the kernel has no CONFIG_MICROCODE_{AMD|INTEL} anymore so this patch change the check
to CONFIG_MICROCODE.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
Arne Fitzenreiter
2023-12-20 08:44:10 +01:00
parent 0348f6b23f
commit 73b04029c9
3 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/core/183/filelists/dracut Symbolic link
View File

@@ -0,0 +1 @@
../../../common/dracut

1
lfs/dracut
View File

@@ -73,6 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# https://bugzilla.ipfire.org/show_bug.cgi?id=12842
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dracut-059-fix-e2fsck-call.patch
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dracut/dracut-056-fix_early_microcode_for_kernel_6.6.patch
cd $(DIR_APP) && ./configure --prefix=/usr --sbindir=/sbin --sysconfdir=/etc
cd $(DIR_APP) && make $(MAKETUNING)

30
src/patches/dracut/dracut-056-fix_early_microcode_for_kernel_6.6.patch Normal file
View File

@@ -0,0 +1,30 @@
diff -Naur dracut-056.prg/dracut.sh dracut-056/dracut.sh
--- dracut-056.prg/dracut.sh 2022-02-18 12:32:53.000000000 +0100
+++ dracut-056/dracut.sh 2023-12-19 23:30:27.720703043 +0100
@@ -1385,22 +1385,21 @@
if [[ $early_microcode == yes ]]; then
if [[ $hostonly ]]; then
if [[ $(get_cpu_vendor) == "AMD" ]]; then
- check_kernel_config CONFIG_MICROCODE_AMD || unset early_microcode
+ check_kernel_config CONFIG_MICROCODE || unset early_microcode
elif [[ $(get_cpu_vendor) == "Intel" ]]; then
- check_kernel_config CONFIG_MICROCODE_INTEL || unset early_microcode
+ 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