summary refs log tree commit diff
path: root/gnu/bootloader
diff options
context:
space:
mode:
authorJan Nieuwenhuizen <janneke@gnu.org>2019-12-30 11:25:40 +0100
committerJan Nieuwenhuizen <janneke@gnu.org>2020-01-25 16:09:12 +0100
commitf52fe7c3f29dfd0804c9d1f297b91287eabcdfb2 (patch)
treeed9226101779b0a35d06fbba2e5efe07b0adc0e8 /gnu/bootloader
parent170d5844dd9e565c6b28c774403cda21981643f8 (diff)
downloadguix-f52fe7c3f29dfd0804c9d1f297b91287eabcdfb2.tar.gz
bootloader: grub: Add gfxmode (resolution) override.
* gnu/bootloader/grub.scm (<grub-theme>): Add `gfxmode' entry.
(eye-candy): Use it.
* doc/guix.texi (Bootloader Configuration): Document it.
Diffstat (limited to 'gnu/bootloader')
-rw-r--r--gnu/bootloader/grub.scm19
1 files changed, 15 insertions, 4 deletions
diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm
index f13685ac9d..b99f5fa4f4 100644
--- a/gnu/bootloader/grub.scm
+++ b/gnu/bootloader/grub.scm
@@ -3,6 +3,7 @@
 ;;; 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.
 ;;;
@@ -88,7 +89,9 @@ 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)))))
+                   (default '((fg . white) (bg . blue))))
+  (gfxmode         grub-gfxmode
+                   (default '("auto"))))          ;list of string
 
 (define %background-image
   (grub-image
@@ -149,8 +152,16 @@ 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)
-        "
-  # Leave 'gfxmode' to 'auto'.
+        (string-append
+         "
+"
+         (let ((gfxmode (and=>
+                         (and=> config bootloader-configuration-theme)
+                         grub-gfxmode)))
+           (if gfxmode
+               (string-append "set gfxmode=" (string-join gfxmode ";"))
+               "# Leave 'gfxmode' to 'auto'."))
+         "
   insmod video_bochs
   insmod video_cirrus
   insmod gfxterm
@@ -166,7 +177,7 @@ system string---e.g., \"x86_64-linux\"."
     insmod vbe
     insmod vga
   fi
-"
+")
         ""))
 
   (define (setup-gfxterm config font-file)