aboutsummaryrefslogtreecommitdiff
path: root/gnu/system/grub.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-03-25 00:22:14 +0100
committerLudovic Courtès <ludo@gnu.org>2017-03-25 22:50:24 +0100
commit5f19fb6a2641f1af977ff45febece2d5724d6049 (patch)
treec75dcb3660e4b3f4af651066863637a61848fecb /gnu/system/grub.scm
parentc5be3467f25d129f13823c5bf32c4425d3ef3607 (diff)
downloadpatches-5f19fb6a2641f1af977ff45febece2d5724d6049.tar
patches-5f19fb6a2641f1af977ff45febece2d5724d6049.tar.gz
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.
Diffstat (limited to 'gnu/system/grub.scm')
-rw-r--r--gnu/system/grub.scm6
1 files changed, 4 insertions, 2 deletions
diff --git a/gnu/system/grub.scm b/gnu/system/grub.scm
index 1f2cd08ff0..4f9bde6a62 100644
--- a/gnu/system/grub.scm
+++ b/gnu/system/grub.scm
@@ -183,8 +183,6 @@ system string---e.g., \"x86_64-linux\"."
(if (string-match "^(x86_64|i[3-6]86)-" system)
"
# Leave 'gfxmode' to 'auto'.
- insmod vbe
- insmod vga
insmod video_bochs
insmod video_cirrus
insmod gfxterm
@@ -195,6 +193,10 @@ system string---e.g., \"x86_64-linux\"."
# which isn't convenient.
insmod efi_gop
insmod efi_uga
+ else
+ # These are specific to non-EFI Intel machines.
+ insmod vbe
+ insmod vga
fi
terminal_output gfxterm