From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:54904) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip6bM-0002QA-E2 for guix-patches@gnu.org; Wed, 08 Jan 2020 03:22:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip6bK-0005uv-Lo for guix-patches@gnu.org; Wed, 08 Jan 2020 03:22:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:43756) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip6bK-0005uq-IM for guix-patches@gnu.org; Wed, 08 Jan 2020 03:22:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ip6bK-0000hw-Bm for guix-patches@gnu.org; Wed, 08 Jan 2020 03:22:02 -0500 Subject: [bug#38809] reopened (Re: [bug#38809] [PATCH] bootloader: grub: Add resolution override.) Resent-Message-ID: From: Jan Nieuwenhuizen References: <87muazt3gm.fsf@gnu.org> <87lfquhzmi.fsf@gnu.org> Date: Wed, 08 Jan 2020 09:21:33 +0100 In-Reply-To: (GNU bug Tracking System's message of "Tue, 07 Jan 2020 20:31:01 +0000") Message-ID: <87d0butl2q.fsf_-_@gnu.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Tobias Geerinckx-Rice Cc: 38809@debbugs.gnu.org --=-=-= Content-Type: text/plain GNU bug Tracking System writes: Hi Tobias, As reported by oscar123123 on irc, this broke guix pull To reproduce: --8<---------------cut here---------------start------------->8--- guix pull --commit=a23091880d4dc6115acbfa3b7ef09d731fc5abb0 --8<---------------cut here---------------end--------------->8--- Tobias reverted the commit (thanks!). I found this test to also show the failure. --8<---------------cut here---------------start------------->8--- make check TESTS=tests/guix-system.sh --8<---------------cut here---------------end--------------->8--- It turns out that this test creates a grub bootsloader with #f for config. Attached is a new version of the patch, that is robust against this; this being the difference: --8<---------------cut here---------------start------------->8--- diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index 55e6344285..b99f5fa4f4 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -152,10 +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) - (string-append " - set gfxmode=" (string-join - (grub-gfxmode (bootloader-configuration-theme config)) - ";") " + (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 --8<---------------cut here---------------end--------------->8--- This fixes make check and I also tested that --8<---------------cut here---------------start------------->8--- guix pull --url=$PWD --8<---------------cut here---------------end--------------->8--- now succeeds. Greetings, janneke --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-bootloader-grub-Add-gfxmode-resolution-override.patch Content-Transfer-Encoding: quoted-printable >From 76bc0b8ef3370a4f98e63f6630c14c55613426f7 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 | 28 ++++++++++++++++++++++++++-- gnu/bootloader/grub.scm | 19 +++++++++++++++---- 2 files changed, 41 insertions(+), 6 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index df1ba428a5..6e3f175488 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -25923,9 +25923,22 @@ must @emph{not} be an OS device name such as @file= {/dev/sda1}. @end table @end deftp =20 +@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 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 =20 @defvr {Scheme Variable} %default-theme This is the default GRUB theme used by the operating system if no @@ -25936,6 +25949,17 @@ It comes with a fancy background image displaying = the GNU and Guix logos. @end defvr =20 +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 =20 @node Invoking guix system @section Invoking @code{guix system} 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 =C2=A9 2016 Chris Marusich ;;; Copyright =C2=A9 2017 Leo Famulari ;;; Copyright =C2=A9 2017 Mathieu Othacehe +;;; Copyright =C2=A9 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 =20 (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 do= n't ;; need to be switched. (if (string-match "^(x86_64|i[3-6]86)-" system) - " - # Leave 'gfxmode' to 'auto'. + (string-append + " +" + (let ((gfxmode (and=3D> + (and=3D> config bootloader-configuration-theme) + grub-gfxmode))) + (if gfxmode + (string-append "set gfxmode=3D" (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 -" +") "")) =20 (define (setup-gfxterm config font-file) --=20 2.24.0 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable --=20 Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org Freelance IT http://JoyofSource.com | Avatar=C2=AE http://AvatarAcademy.com --=-=-=--