branch master updated: Revert "bootloader: grub: Add gfxmode (resolution) override."

[guix-commits]

This is an automated email from the git hooks/post-receive script.

nckx pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 8e8d45e  Revert "bootloader: grub: Add gfxmode (resolution) override."
8e8d45e is described below

commit 8e8d45e6ac02a7f282ce5bd5be9ae9a9a150a01f
Author: Tobias Geerinckx-Rice <address@hidden>
AuthorDate: Tue Jan 7 23:31:44 2020 +0100

    Revert "bootloader: grub: Add gfxmode (resolution) override."
    
    This reverts commit a23091880d4dc6115acbfa3b7ef09d731fc5abb0.
    It causes ‘guix pull’ to fail: <https://paste.debian.net/plain/1125061>.
---
 doc/guix.texi           | 28 ++--------------------------
 gnu/bootloader/grub.scm | 13 ++++---------
 2 files changed, 6 insertions(+), 35 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 6e3f175..df1ba42 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -25923,22 +25923,9 @@ must @emph{not} be an OS device name such as 
@file{/dev/sda1}.
 @end table
 @end deftp
 
-@cindex HDPI
-@cindex HiDPI
-@cindex resolution
 @c FIXME: Write documentation once it's stable.
-For now only GRUB has theme support.  GRUB themes are created using
-the @code{grub-theme} form, which is not fully documented yet.
-
-@deftp {Data Type} grub-theme
-Data type representing the configuration of the GRUB theme.
-
-@table @asis
-@item @code{gfxmode} (default: @code{'("auto")})
-The GRUB @code{gfxmode} to set (a list of screen resolution strings, see
-@pxref{gfxmode,,, grub, GNU GRUB manual}).
-@end table
-@end deftp
+For now only GRUB has theme support. GRUB themes are created using
+the @code{grub-theme} form, which is not documented yet.
 
 @defvr {Scheme Variable} %default-theme
 This is the default GRUB theme used by the operating system if no
@@ -25949,17 +25936,6 @@ It comes with a fancy background image displaying the 
GNU and Guix
 logos.
 @end defvr
 
-For example, to override the default resolution, you may use something
-like
-
-@lisp
-(bootloader
- (grub-configuration
- ;; @dots{}
- (theme (grub-theme
-         (inherit %default-theme)
-         (gfxmode '("1024x786x32" "auto"))))))
-@end lisp
 
 @node Invoking guix system
 @section Invoking @code{guix system}
diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm
index 55e6344..f13685a 100644
--- a/gnu/bootloader/grub.scm
+++ b/gnu/bootloader/grub.scm
@@ -3,7 +3,6 @@
 ;;; Copyright © 2016 Chris Marusich <address@hidden>
 ;;; Copyright © 2017 Leo Famulari <address@hidden>
 ;;; Copyright © 2017 Mathieu Othacehe <address@hidden>
-;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen <address@hidden>
 ;;;
 ;;; 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)