unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#38809] [PATCH] bootloader: grub: Add resolution override.
@ 2019-12-30 10:33 Jan Nieuwenhuizen
  2020-01-04  4:39 ` Brett Gilio
                   ` (4 more replies)
  0 siblings, 5 replies; 12+ messages in thread
From: Jan Nieuwenhuizen @ 2019-12-30 10:33 UTC (permalink / raw)
  To: 38809

[-- Attachment #1: Type: text/plain, Size: 229 bytes --]

Hi,

With this patch I finally have a readable GRUB menu.  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?

Greetings,
janneke


[-- Attachment #2: 0001-bootloader-grub-Add-resolution-override.patch --]
[-- Type: text/x-patch, Size: 3492 bytes --]

From dfceb5702b0de5787f79e1098b4787e9d3adbe4e 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 resolution override.

* gnu/bootloader/grub.scm (<grub-theme>): Add `resolution' entry.
(eye-candy): Use it.
* doc/guix.texi (Bootloader Configuration): Document it.
---
 doc/guix.texi           | 26 ++++++++++++++++++++++++--
 gnu/bootloader/grub.scm | 11 +++++++----
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index efc59c1aaf..02cecae043 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -25923,9 +25923,20 @@ 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{resolution} (default: @code{"auto"})
+The @code{gfxmode} to set (@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 +25947,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)
+         (resolution "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 fd62f627a0..70de3edeb5 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))))
+  (resolution      grub-resolution
+                   (default "auto")))
 
 (define %background-image
   (grub-image
@@ -149,8 +152,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)
-        "
-  # Leave 'gfxmode' to 'auto'.
+        (string-append "
+  set gfxmode=" (grub-resolution (bootloader-configuration-theme config)) "
   insmod video_bochs
   insmod video_cirrus
   insmod gfxterm
@@ -166,7 +169,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

^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [bug#38809] [PATCH] bootloader: grub: Add resolution override.
  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
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 12+ messages in thread
From: Brett Gilio @ 2020-01-04  4:39 UTC (permalink / raw)
  To: Jan Nieuwenhuizen; +Cc: 38809

Jan Nieuwenhuizen <janneke@gnu.org> writes:

> Hi,
>
> With this patch I finally have a readable GRUB menu.  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?
>
> Greetings,
> janneke
>
>>From dfceb5702b0de5787f79e1098b4787e9d3adbe4e 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 resolution override.
>
> * gnu/bootloader/grub.scm (<grub-theme>): Add `resolution' entry.
> (eye-candy): Use it.
> * doc/guix.texi (Bootloader Configuration): Document it.
> ---
>  doc/guix.texi           | 26 ++++++++++++++++++++++++--
>  gnu/bootloader/grub.scm | 11 +++++++----
>  2 files changed, 31 insertions(+), 6 deletions(-)
>
> diff --git a/doc/guix.texi b/doc/guix.texi
> index efc59c1aaf..02cecae043 100644
> --- a/doc/guix.texi
> +++ b/doc/guix.texi
> @@ -25923,9 +25923,20 @@ 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{resolution} (default: @code{"auto"})
> +The @code{gfxmode} to set (@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 +25947,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)
> +         (resolution "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 fd62f627a0..70de3edeb5 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))))
> +  (resolution      grub-resolution
> +                   (default "auto")))
>  
>  (define %background-image
>    (grub-image
> @@ -149,8 +152,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)
> -        "
> -  # Leave 'gfxmode' to 'auto'.
> +        (string-append "
> +  set gfxmode=" (grub-resolution (bootloader-configuration-theme config)) "
>    insmod video_bochs
>    insmod video_cirrus
>    insmod gfxterm
> @@ -166,7 +169,7 @@ system string---e.g., \"x86_64-linux\"."
>      insmod vbe
>      insmod vga
>    fi
> -"
> +")
>          ""))
>  
>    (define (setup-gfxterm config font-file)
> -- 
> 2.24.0

Hi Jan,

This seems like a sensible change, and is something other distributions
seem to implement in their own manner, as well. I am in favor of this
change, and will test it ASAP.

-- 
Brett M. Gilio
GNU Guix, Contributor | GNU Project, Webmaster
[DFC0 C7F7 9EE6 0CA7 AE55 5E19 6722 43C4 A03F 0EEE]
<brettg@gnu.org> <brettg@posteo.net>

^ permalink raw reply	[flat|nested] 12+ messages in thread

* [bug#38809] [PATCH] bootloader: grub: Add resolution override.
  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
                   ` (2 subsequent siblings)
  4 siblings, 1 reply; 12+ messages in thread
From: Tobias Geerinckx-Rice via Guix-patches via @ 2020-01-04 10:41 UTC (permalink / raw)
  To: 38809, Jan Nieuwenhuizen

[-- Attachment #1: Type: text/plain, Size: 468 bytes --]

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.

Kind regards,

T G-R

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

^ permalink raw reply	[flat|nested] 12+ messages in thread

* [bug#38809] [PATCH] bootloader: grub: Add resolution override.
  2020-01-04 10:41 ` Tobias Geerinckx-Rice via Guix-patches via
@ 2020-01-04 11:48   ` Jan Nieuwenhuizen
  0 siblings, 0 replies; 12+ messages in thread
From: Jan Nieuwenhuizen @ 2020-01-04 11:48 UTC (permalink / raw)
  To: Tobias Geerinckx-Rice; +Cc: 38809

[-- Attachment #1: Type: text/plain, Size: 693 bytes --]

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


[-- Attachment #2: 0001-bootloader-grub-Add-gfxmode-resolution-override.patch --]
[-- Type: text/x-patch, Size: 3631 bytes --]

From 333ba3ee53e1c359a01aed80c24d17ece39ad975 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           | 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 <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,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


[-- 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

^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [bug#38809] [PATCH] bootloader: grub: Add resolution override.
  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 15:45 ` Danny Milosavljevic
  2020-01-04 16:07   ` Jan Nieuwenhuizen
       [not found] ` <handler.38809.D38809.157842900518542.notifdone@debbugs.gnu.org>
  2020-01-23 15:12 ` [bug#38809] [PATCH] bootloader: grub: Add resolution override Alex Griffin
  4 siblings, 1 reply; 12+ messages in thread
From: Danny Milosavljevic @ 2020-01-04 15:45 UTC (permalink / raw)
  To: Jan Nieuwenhuizen; +Cc: 38809

[-- Attachment #1: Type: text/plain, Size: 793 bytes --]

Hi janneke,

On Mon, 30 Dec 2019 11:33:09 +0100
Jan Nieuwenhuizen <janneke@gnu.org> wrote:

> With this patch I finally have a readable GRUB menu.  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?

Especially with HiDPI, the word "resolution" is ambiguous.

Also, gfxmode values are not standardized (f.e. u-boot would not know what
to do with them), so using a non-grub-specific key doesn't bring us anything.

I much prefer lists instead of one string.  But grub apparently has "," and
";" as separators--presumably with the same meaning?

It also has the special value "keep" as possible first item.

In view of this complication it's maybe better not to use lists.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 12+ messages in thread

* [bug#38809] [PATCH] bootloader: grub: Add resolution override.
  2020-01-04 15:45 ` Danny Milosavljevic
@ 2020-01-04 16:07   ` Jan Nieuwenhuizen
  2020-01-05 12:27     ` Danny Milosavljevic
  0 siblings, 1 reply; 12+ messages in thread
From: Jan Nieuwenhuizen @ 2020-01-04 16:07 UTC (permalink / raw)
  To: Danny Milosavljevic; +Cc: 38809

Danny Milosavljevic writes:

Hi Danny,

>> With this patch I finally have a readable GRUB menu.  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?
>
> Especially with HiDPI, the word "resolution" is ambiguous.
>
> Also, gfxmode values are not standardized (f.e. u-boot would not know what
> to do with them), so using a non-grub-specific key doesn't bring us anything.

That's another good argument; thank you for chiming in!  I think we all
agree now.  I sent an updated patch using `gfxmode' in another mail.

> I much prefer lists instead of one string.  But grub apparently has "," and
> ";" as separators--presumably with the same meaning?

Yes, that was also Tobias' wish, so we now have it as a list too.

> It also has the special value "keep" as possible first item.
>
> In view of this complication it's maybe better not to use lists.

Hmm, yes that's why I had some doubts too.  After Tobias' comment I now
chose to use a list, and the example now says

   (gfxmode '("1024x786x32" "auto"))

I hope that people can imagine prepending "keep"?

Greetings,
janneke

-- 
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com

^ permalink raw reply	[flat|nested] 12+ messages in thread

* [bug#38809] [PATCH] bootloader: grub: Add resolution override.
  2020-01-04 16:07   ` Jan Nieuwenhuizen
@ 2020-01-05 12:27     ` Danny Milosavljevic
  2020-01-07 20:29       ` bug#38809: " Jan Nieuwenhuizen
  0 siblings, 1 reply; 12+ messages in thread
From: Danny Milosavljevic @ 2020-01-05 12:27 UTC (permalink / raw)
  To: Jan Nieuwenhuizen; +Cc: 38809

[-- Attachment #1: Type: text/plain, Size: 367 bytes --]

Hi janneke,

On Sat, 04 Jan 2020 17:07:24 +0100
Jan Nieuwenhuizen <janneke@gnu.org> wrote:

> Hmm, yes that's why I had some doubts too.  After Tobias' comment I now
> chose to use a list, and the example now says
> 
>    (gfxmode '("1024x786x32" "auto"))
> 
> I hope that people can imagine prepending "keep"?

Yes, it should be fine.  Thanks!  LGTM.


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 12+ messages in thread

* bug#38809: [PATCH] bootloader: grub: Add resolution override.
  2020-01-05 12:27     ` Danny Milosavljevic
@ 2020-01-07 20:29       ` Jan Nieuwenhuizen
  0 siblings, 0 replies; 12+ messages in thread
From: Jan Nieuwenhuizen @ 2020-01-07 20:29 UTC (permalink / raw)
  To: Danny Milosavljevic; +Cc: Tobias Geerinckx-Rice, 38809-done

Danny Milosavljevic writes:

Hi Danny, Tobias,

> Yes, it should be fine.  Thanks!  LGTM.

After chatting with Tobias on irc, pushed to master as a23091880d4dc6115acbfa3b7ef09d731fc5abb0

Greetings,
janneke

-- 
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com

^ permalink raw reply	[flat|nested] 12+ messages in thread

* [bug#38809] reopened (Re: [bug#38809] [PATCH] bootloader: grub: Add resolution override.)
       [not found] ` <handler.38809.D38809.157842900518542.notifdone@debbugs.gnu.org>
@ 2020-01-08  8:21   ` Jan Nieuwenhuizen
  0 siblings, 0 replies; 12+ messages in thread
From: Jan Nieuwenhuizen @ 2020-01-08  8:21 UTC (permalink / raw)
  To: Tobias Geerinckx-Rice; +Cc: 38809

[-- 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

^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [bug#38809] [PATCH] bootloader: grub: Add resolution override.
  2019-12-30 10:33 [bug#38809] [PATCH] bootloader: grub: Add resolution override Jan Nieuwenhuizen
                   ` (3 preceding siblings ...)
       [not found] ` <handler.38809.D38809.157842900518542.notifdone@debbugs.gnu.org>
@ 2020-01-23 15:12 ` Alex Griffin
  2020-01-23 23:00   ` Tobias Geerinckx-Rice via Guix-patches via
  4 siblings, 1 reply; 12+ messages in thread
From: Alex Griffin @ 2020-01-23 15:12 UTC (permalink / raw)
  To: 38809

I've been using the updated patch for a couple weeks now without issue. Maybe it's time to commit it again?

-- 
Alex Griffin

^ permalink raw reply	[flat|nested] 12+ messages in thread

* [bug#38809] [PATCH] bootloader: grub: Add resolution override.
  2020-01-23 15:12 ` [bug#38809] [PATCH] bootloader: grub: Add resolution override Alex Griffin
@ 2020-01-23 23:00   ` Tobias Geerinckx-Rice via Guix-patches via
  2020-01-25 15:10     ` bug#38809: " Jan Nieuwenhuizen
  0 siblings, 1 reply; 12+ messages in thread
From: Tobias Geerinckx-Rice via Guix-patches via @ 2020-01-23 23:00 UTC (permalink / raw)
  To: 38809

[-- Attachment #1: Type: text/plain, Size: 234 bytes --]

Alex Griffin 写道:
> I've been using the updated patch for a couple weeks now without 
> issue. Maybe it's time to commit it again?

Yes.  I think I LGTM'd this on IRC already, but regardless: LGTM!

Kind regards,

T G-R

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

^ permalink raw reply	[flat|nested] 12+ messages in thread

* bug#38809: [PATCH] bootloader: grub: Add resolution override.
  2020-01-23 23:00   ` Tobias Geerinckx-Rice via Guix-patches via
@ 2020-01-25 15:10     ` Jan Nieuwenhuizen
  0 siblings, 0 replies; 12+ messages in thread
From: Jan Nieuwenhuizen @ 2020-01-25 15:10 UTC (permalink / raw)
  To: Tobias Geerinckx-Rice; +Cc: 38809-done

Tobias Geerinckx-Rice writes:

> Alex Griffin 写道:
>> I've been using the updated patch for a couple weeks now without
>> issue. Maybe it's time to commit it again?
>
> Yes.  I think I LGTM'd this on IRC already, but regardless: LGTM!
>
> Kind regards,

Thank you both, pushed to master as f52fe7c3f29dfd0804c9d1f297b91287eabcdfb2

janneke

-- 
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com

^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2020-01-25 15:12 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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   ` [bug#38809] reopened (Re: [bug#38809] [PATCH] bootloader: grub: Add resolution override.) Jan Nieuwenhuizen
2020-01-23 15:12 ` [bug#38809] [PATCH] bootloader: grub: Add resolution override Alex Griffin
2020-01-23 23:00   ` Tobias Geerinckx-Rice via Guix-patches via
2020-01-25 15:10     ` bug#38809: " Jan Nieuwenhuizen

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).