From patchwork Sat Jan 4 11:48:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 19577 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2D6A6179DE; Sat, 4 Jan 2020 11:49:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id C771B17981 for ; Sat, 4 Jan 2020 11:49:10 +0000 (GMT) Received: from localhost ([::1]:33438 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1inhva-0007I8-6T for patchwork@mira.cbaines.net; Sat, 04 Jan 2020 06:49:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47732) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1inhvU-0007Hp-40 for guix-patches@gnu.org; Sat, 04 Jan 2020 06:49:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1inhvS-0005sW-L2 for guix-patches@gnu.org; Sat, 04 Jan 2020 06:49:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:36549) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1inhvS-0005rz-GG for guix-patches@gnu.org; Sat, 04 Jan 2020 06:49:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1inhvS-0003VU-Eu for guix-patches@gnu.org; Sat, 04 Jan 2020 06:49:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38809] [PATCH] bootloader: grub: Add resolution override. Resent-From: Jan Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 04 Jan 2020 11:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38809 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Tobias Geerinckx-Rice Cc: 38809@debbugs.gnu.org Received: via spool by 38809-submit@debbugs.gnu.org id=B38809.157813851113440 (code B ref 38809); Sat, 04 Jan 2020 11:49:02 +0000 Received: (at 38809) by debbugs.gnu.org; 4 Jan 2020 11:48:31 +0000 Received: from localhost ([127.0.0.1]:42522 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1inhus-0003Ub-Nk for submit@debbugs.gnu.org; Sat, 04 Jan 2020 06:48:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38237) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1inhuq-0003UN-8X for 38809@debbugs.gnu.org; Sat, 04 Jan 2020 06:48:24 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:50959) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1inhui-0004pR-9v; Sat, 04 Jan 2020 06:48:16 -0500 Received: from [2001:980:1b4f:1:42d2:832d:bb59:862] (port=35652 helo=dundal.peder.onsbrabantnet.nl) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1inhuh-0003LF-Ro; Sat, 04 Jan 2020 06:48:16 -0500 From: Jan Nieuwenhuizen References: <87lfquhzmi.fsf@gnu.org> <87lfqn8pwf.fsf@nckx> Date: Sat, 04 Jan 2020 12:48:06 +0100 In-Reply-To: <87lfqn8pwf.fsf@nckx> (Tobias Geerinckx-Rice's message of "Sat, 04 Jan 2020 11:41:36 +0100") Message-ID: <87ftgvv3wp.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Tobias Geerinckx-Rice writes: > Jan Nieuwenhuizen 写道： >> With this patch I finally have a readable GRUB menu. > > Thanks! Perhaps it will help solve my EFI framebuffer woes (probably > not but who knows. > >> I am not sure about the name and semantics of `resolution': >> Better to use `gfxmode', and/or use a list of strings >> '("1024x768x32" "auto"), ... WDYT? > > Yes please, on both counts. Grub-theme should expose the GRUB > variable, not a lossy abstraction. Okay, I think I just wished the GRUB name would be more meaningful for casual users (such as myself). I'm terrible with TLAwords, and very happy I found and fixed this ;-) Greetings, janneke From 333ba3ee53e1c359a01aed80c24d17ece39ad975 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 30 Dec 2019 11:25:40 +0100 Subject: [PATCH] bootloader: grub: Add gfxmode (resolution) override. * gnu/bootloader/grub.scm (): Add `gfxmode' entry. (eye-candy): Use it. * doc/guix.texi (Bootloader Configuration): Document it. --- doc/guix.texi | 27 +++++++++++++++++++++++++-- gnu/bootloader/grub.scm | 13 +++++++++---- 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 70e3dfea6a..eaa4e7ab97 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -25923,9 +25923,21 @@ must @emph{not} be an OS device name such as @file{/dev/sda1}. @end table @end deftp +@cindex HDPI +@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 documented yet. +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 @defvr {Scheme Variable} %default-theme This is the default GRUB theme used by the operating system if no @@ -25936,6 +25948,17 @@ 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 adcdbdbab0..229bba96ad 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016 Chris Marusich ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen ;;; ;;; 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,10 @@ 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 " + set gfxmode=" (string-join + (grub-gfxmode (bootloader-configuration-theme config)) + ";") " insmod video_bochs insmod video_cirrus insmod gfxterm @@ -166,7 +171,7 @@ system string---e.g., \"x86_64-linux\"." insmod vbe insmod vga fi -" +") "")) (define (setup-gfxterm config font-file) -- 2.24.0