From: Jan Nieuwenhuizen <janneke@gnu.org>
To: Tobias Geerinckx-Rice <me@tobias.gr>
Cc: 38809@debbugs.gnu.org
Subject: [bug#38809] reopened (Re: [bug#38809] [PATCH] bootloader: grub: Add resolution override.)
Date: Wed, 08 Jan 2020 09:21:33 +0100 [thread overview]
Message-ID: <87d0butl2q.fsf_-_@gnu.org> (raw)
In-Reply-To: <handler.38809.D38809.157842900518542.notifdone@debbugs.gnu.org> (GNU bug Tracking System's message of "Tue, 07 Jan 2020 20:31:01 +0000")
[-- Attachment #1: Type: text/plain, Size: 2049 bytes --]
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
[-- Attachment #2: 0001-bootloader-grub-Add-gfxmode-resolution-override.patch --]
[-- Type: text/x-patch, Size: 3849 bytes --]
From 76bc0b8ef3370a4f98e63f6630c14c55613426f7 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Mon, 30 Dec 2019 11:25:40 +0100
Subject: [PATCH] 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.
---
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
+@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
@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
+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 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)
--
2.24.0
[-- Attachment #3: Type: text/plain, Size: 152 bytes --]
--
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com
next prev parent reply other threads:[~2020-01-08 8:22 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-30 10:33 [bug#38809] [PATCH] bootloader: grub: Add resolution override Jan Nieuwenhuizen
2020-01-04 4:39 ` Brett Gilio
2020-01-04 10:41 ` Tobias Geerinckx-Rice via Guix-patches via
2020-01-04 11:48 ` Jan Nieuwenhuizen
2020-01-04 15:45 ` Danny Milosavljevic
2020-01-04 16:07 ` Jan Nieuwenhuizen
2020-01-05 12:27 ` Danny Milosavljevic
2020-01-07 20:29 ` bug#38809: " Jan Nieuwenhuizen
[not found] ` <handler.38809.D38809.157842900518542.notifdone@debbugs.gnu.org>
2020-01-08 8:21 ` Jan Nieuwenhuizen [this message]
2020-01-23 15:12 ` [bug#38809] " Alex Griffin
2020-01-23 23:00 ` Tobias Geerinckx-Rice via Guix-patches via
2020-01-25 15:10 ` bug#38809: " Jan Nieuwenhuizen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87d0butl2q.fsf_-_@gnu.org \
--to=janneke@gnu.org \
--cc=38809@debbugs.gnu.org \
--cc=me@tobias.gr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.