summaryrefslogtreecommitdiff
path: root/gnu/system
diff options
context:
space:
mode:
authorLeo Famulari <leo@famulari.name>2017-03-27 21:19:38 -0400
committerLeo Famulari <leo@famulari.name>2017-03-27 21:19:38 -0400
commitc17383f400d3b942c22ec46b556cad8ca3a2fce1 (patch)
treef430fdc7b6e41a652b4a0dbdd08050f586e4b24d /gnu/system
parentb1a8fd2d2cf6bf1b20ba8d26ca6f9a7caef60cbc (diff)
parent7aeb4ffa5828206f89ec62226863c27f7c1c028d (diff)
downloadpatches-c17383f400d3b942c22ec46b556cad8ca3a2fce1.tar
patches-c17383f400d3b942c22ec46b556cad8ca3a2fce1.tar.gz
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/system')
-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