[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: system: grub: Don't attempt to load non-EFI modules on EFI.
From: |
Ludovic Courtès |
Subject: |
01/01: system: grub: Don't attempt to load non-EFI modules on EFI. |
Date: |
Sat, 25 Mar 2017 17:50:37 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 5f19fb6a2641f1af977ff45febece2d5724d6049
Author: Ludovic Courtès <address@hidden>
Date: Sat Mar 25 00:22:14 2017 +0100
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.
---
gnu/system/grub.scm | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/gnu/system/grub.scm b/gnu/system/grub.scm
index 1f2cd08..4f9bde6 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