diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2020-01-07 23:31:44 +0100 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2020-01-07 23:31:44 +0100 |
| commit | 8e8d45e6ac02a7f282ce5bd5be9ae9a9a150a01f (patch) | |
| tree | 5bc662b46dc4a78083fa1bd06d61d12b2f92c312 /gnu | |
| parent | a23091880d4dc6115acbfa3b7ef09d731fc5abb0 (diff) | |
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.scm | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index 55e63442855..f13685ac9dd 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | ;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com> | 3 | ;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com> |
| 4 | ;;; Copyright © 2017 Leo Famulari <leo@famulari.name> | 4 | ;;; Copyright © 2017 Leo Famulari <leo@famulari.name> |
| 5 | ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> | 5 | ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> |
| 6 | ;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> | ||
| 7 | ;;; | 6 | ;;; |
| 8 | ;;; This file is part of GNU Guix. | 7 | ;;; This file is part of GNU Guix. |
| 9 | ;;; | 8 | ;;; |
| @@ -89,9 +88,7 @@ denoting a file name." | |||
| 89 | (color-normal grub-theme-color-normal | 88 | (color-normal grub-theme-color-normal |
| 90 | (default '((fg . cyan) (bg . blue)))) | 89 | (default '((fg . cyan) (bg . blue)))) |
| 91 | (color-highlight grub-theme-color-highlight | 90 | (color-highlight grub-theme-color-highlight |
| 92 | (default '((fg . white) (bg . blue)))) | 91 | (default '((fg . white) (bg . blue))))) |
| 93 | (gfxmode grub-gfxmode | ||
| 94 | (default '("auto")))) ;list of string | ||
| 95 | 92 | ||
| 96 | (define %background-image | 93 | (define %background-image |
| 97 | (grub-image | 94 | (grub-image |
| @@ -152,10 +149,8 @@ system string---e.g., \"x86_64-linux\"." | |||
| 152 | ;; most other modern architectures have no other mode and therefore don't | 149 | ;; most other modern architectures have no other mode and therefore don't |
| 153 | ;; need to be switched. | 150 | ;; need to be switched. |
| 154 | (if (string-match "^(x86_64|i[3-6]86)-" system) | 151 | (if (string-match "^(x86_64|i[3-6]86)-" system) |
| 155 | (string-append " | 152 | " |
| 156 | set gfxmode=" (string-join | 153 | # Leave 'gfxmode' to 'auto'. |
| 157 | (grub-gfxmode (bootloader-configuration-theme config)) | ||
| 158 | ";") " | ||
| 159 | insmod video_bochs | 154 | insmod video_bochs |
| 160 | insmod video_cirrus | 155 | insmod video_cirrus |
| 161 | insmod gfxterm | 156 | insmod gfxterm |
| @@ -171,7 +166,7 @@ system string---e.g., \"x86_64-linux\"." | |||
| 171 | insmod vbe | 166 | insmod vbe |
| 172 | insmod vga | 167 | insmod vga |
| 173 | fi | 168 | fi |
| 174 | ") | 169 | " |
| 175 | "")) | 170 | "")) |
| 176 | 171 | ||
| 177 | (define (setup-gfxterm config font-file) | 172 | (define (setup-gfxterm config font-file) |
