aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2020-01-07 23:31:44 +0100
committerTobias Geerinckx-Rice <me@tobias.gr>2020-01-07 23:31:44 +0100
commit8e8d45e6ac02a7f282ce5bd5be9ae9a9a150a01f (patch)
tree5bc662b46dc4a78083fa1bd06d61d12b2f92c312 /gnu
parenta23091880d4dc6115acbfa3b7ef09d731fc5abb0 (diff)
downloadguix-8e8d45e6ac02a7f282ce5bd5be9ae9a9a150a01f.tar
guix-8e8d45e6ac02a7f282ce5bd5be9ae9a9a150a01f.tar.gz
Revert "bootloader: grub: Add gfxmode (resolution) override."
This reverts commit a23091880d4dc6115acbfa3b7ef09d731fc5abb0. It causes ‘guix pull’ to fail: <https://paste.debian.net/plain/1125061>.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/bootloader/grub.scm13
1 files changed, 4 insertions, 9 deletions
diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm
index 55e6344285..f13685ac9d 100644
--- a/gnu/bootloader/grub.scm
+++ b/gnu/bootloader/grub.scm
@@ -3,7 +3,6 @@
;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
-;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -89,9 +88,7 @@ denoting a file name."
(color-normal grub-theme-color-normal
(default '((fg . cyan) (bg . blue))))
(color-highlight grub-theme-color-highlight
- (default '((fg . white) (bg . blue))))
- (gfxmode grub-gfxmode
- (default '("auto")))) ;list of string
+ (default '((fg . white) (bg . blue)))))
(define %background-image
(grub-image
@@ -152,10 +149,8 @@ system string---e.g., \"x86_64-linux\"."
;; most other modern architectures have no other mode and therefore don't
;; need to be switched.
(if (string-match "^(x86_64|i[3-6]86)-" system)
- (string-append "
- set gfxmode=" (string-join
- (grub-gfxmode (bootloader-configuration-theme config))
- ";") "
+ "
+ # Leave 'gfxmode' to 'auto'.
insmod video_bochs
insmod video_cirrus
insmod gfxterm
@@ -171,7 +166,7 @@ system string---e.g., \"x86_64-linux\"."
insmod vbe
insmod vga
fi
-")
+"
""))
(define (setup-gfxterm config font-file)