faerbit/archiso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configs/*/grub/grub.cfg: rearrange module loading

Browse Source 
* Do not manually load modules that will get loaded by invoking a command.
* Explicitly load serial modules.
* Move `insmod all_video` after the font is loaded.
This commit is contained in:
nl6720 2023-02-24 17:50:13 +02:00
parent 5e72546e89
commit 0a3a57a88b
No known key found for this signature in database
GPG Key ID: 5CE88535E188D369
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configs/baseline/grub/grub.cfg
View File

@ -9,15 +9,19 @@ insmod exfat
insmod udf insmod udf
# Use graphics-mode output # Use graphics-mode output
insmod all_video
insmod font
if loadfont "${prefix}/fonts/unicode.pf2" ; then if loadfont "${prefix}/fonts/unicode.pf2" ; then
insmod all_video
set gfxmode="auto" set gfxmode="auto"
terminal_input console terminal_input console
terminal_output console terminal_output console
fi fi
# Enable serial console # Enable serial console
insmod serial
insmod usbserial_common
insmod usbserial_ftdi
insmod usbserial_pl2303
insmod usbserial_usbdebug
if serial --unit=0 --speed=115200; then if serial --unit=0 --speed=115200; then
terminal_input --append serial terminal_input --append serial
terminal_output --append serial terminal_output --append serial

10
configs/releng/grub/grub.cfg
View File

@ -9,15 +9,19 @@ insmod exfat
insmod udf insmod udf
# Use graphics-mode output # Use graphics-mode output
insmod all_video
insmod font
if loadfont "${prefix}/fonts/unicode.pf2" ; then if loadfont "${prefix}/fonts/unicode.pf2" ; then
insmod all_video
set gfxmode="auto" set gfxmode="auto"
terminal_input console terminal_input console
terminal_output console terminal_output console
fi fi
# Enable serial console # Enable serial console
insmod serial
insmod usbserial_common
insmod usbserial_ftdi
insmod usbserial_pl2303
insmod usbserial_usbdebug
if serial --unit=0 --speed=115200; then if serial --unit=0 --speed=115200; then
terminal_input --append serial terminal_input --append serial
terminal_output --append serial terminal_output --append serial
@ -61,12 +65,10 @@ if [ "${grub_platform}" == "efi" ]; then
linux /boot/memtest86+/memtest.efi linux /boot/memtest86+/memtest.efi
} }
menuentry "UEFI Shell" --class efi { menuentry "UEFI Shell" --class efi {
insmod chain
chainloader /shellx64.efi chainloader /shellx64.efi
} }
elif [ "${grub_cpu}" == "i386" ]; then elif [ "${grub_cpu}" == "i386" ]; then
menuentry "UEFI Shell" --class efi { menuentry "UEFI Shell" --class efi {
insmod chain
chainloader /shellia32.efi chainloader /shellia32.efi
} }
fi fi