root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-19 19:40:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix UCODE on grub config

Browse source
This commit is contained in:
Tobias Powalowski 2023-06-27 08:29:06 +02:00
parent 5343e33044
commit f0186dfd17
1 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
usr/lib/archboot/installer/bootloader.sh
View file

@ -595,6 +595,9 @@ _do_grub_config() {
_SUBDIR="/$(btrfs subvolume show "${_DESTDIR}/boot" | grep Name | cut -c 11-60)" _SUBDIR="/$(btrfs subvolume show "${_DESTDIR}/boot" | grep Name | cut -c 11-60)"
fi fi
fi fi
if [[ -n "${_UCODE}" ]]; then
_INITRD_UCODE="${_SUBDIR}/${UC_UCODE}"
fi
## Move old config file, if any ## Move old config file, if any
if [[ -n "${_UEFI_SECURE_BOOT}" ]]; then if [[ -n "${_UEFI_SECURE_BOOT}" ]]; then
_GRUB_CFG="grub${_SPEC_UEFI_ARCH}.cfg" _GRUB_CFG="grub${_SPEC_UEFI_ARCH}.cfg"
@ -679,27 +682,17 @@ EOF
_LINUX_MOD_COMMAND=$(echo "${_LINUX_UNMOD_COMMAND}" | sed -e 's# # #g' | sed -e 's# # #g') _LINUX_MOD_COMMAND=$(echo "${_LINUX_UNMOD_COMMAND}" | sed -e 's# # #g' | sed -e 's# # #g')
## create default kernel entry ## create default kernel entry
_NUMBER=0 _NUMBER=0
if [[ "${_RUNNING_ARCH}" == "aarch64" ]]; then
cat << EOF >> "${_DESTDIR}/${_GRUB_PREFIX_DIR}/${_GRUB_CFG}" cat << EOF >> "${_DESTDIR}/${_GRUB_PREFIX_DIR}/${_GRUB_CFG}"
# (${_NUMBER}) Arch Linux # (${_NUMBER}) Arch Linux
menuentry "Arch Linux" { menuentry "Arch Linux" {
set gfxpayload="keep" set gfxpayload="keep"
${_GRUB_ROOT_DRIVE} ${_GRUB_ROOT_DRIVE}
${_LINUX_MOD_COMMAND} ${_LINUX_MOD_COMMAND}
initrd ${_SUBDIR}/${_UCODE} ${_SUBDIR}/${_INITRAMFS} initrd ${_INITRD_UCODE} ${_SUBDIR}/${_INITRAMFS}
} }
EOF EOF
_NUMBER=$((_NUMBER+1)) _NUMBER=$((_NUMBER+1))
else if [[ "${_RUNNING_ARCH}" == "x86_64" ]]; then
cat << EOF >> "${_DESTDIR}/${_GRUB_PREFIX_DIR}/${_GRUB_CFG}"
# (${_NUMBER}) Arch Linux
menuentry "Arch Linux" {
set gfxpayload="keep"
${_GRUB_ROOT_DRIVE}
${_LINUX_MOD_COMMAND}
initrd ${_SUBDIR}/${_UCODE} ${_SUBDIR}/${_UCODE} ${_SUBDIR}/${_INITRAMFS}
}
EOF
if [[ -n "${_UEFI_BOOT}" ]]; then if [[ -n "${_UEFI_BOOT}" ]]; then
_NUMBER=$((_NUMBER+1)) _NUMBER=$((_NUMBER+1))
cat << EOF >> "${_DESTDIR}/${_GRUB_PREFIX_DIR}/${_GRUB_CFG}" cat << EOF >> "${_DESTDIR}/${_GRUB_PREFIX_DIR}/${_GRUB_CFG}"