nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

system: grub: Don't attempt to load non-EFI modules on EFI. 

This resulted in a couple of harmless warnings just before the menu is
displayed.

* gnu/system/grub.scm (eye-candy)[setup-gfxterm-body]: Move 'vbe' and
'vga' loading to the non-EFI branch.
This commit is contained in:
Ludovic Courtès 2017-03-25 00:22:14 +01:00
parent c5be3467f2
commit 5f19fb6a26
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnu/system/grub.scm
View File

@ -183,8 +183,6 @@ system string---e.g., \"x86_64-linux\"."
(if (string-match "^(x86_64|i[3-6]86)-" system) (if (string-match "^(x86_64|i[3-6]86)-" system)
" "
# Leave 'gfxmode' to 'auto'. # Leave 'gfxmode' to 'auto'.
insmod vbe
insmod vga
insmod video_bochs insmod video_bochs
insmod video_cirrus insmod video_cirrus
insmod gfxterm insmod gfxterm
@ -195,6 +193,10 @@ system string---e.g., \"x86_64-linux\"."
# which isn't convenient. # which isn't convenient.
insmod efi_gop insmod efi_gop
insmod efi_uga insmod efi_uga
else
# These are specific to non-EFI Intel machines.
insmod vbe
insmod vga
fi fi
terminal_output gfxterm terminal_output gfxterm