bug#56122: closed ([PATCH] guix system: Inline menu-entries in to bootcfg in perform-action.)

[GNU bug Tracking System]

Your message dated Thu, 23 Jun 2022 13:09:27 +0100
with message-id <87czezmvhe.fsf@cbaines.net>
and subject line Re: [bug#56122] [PATCH] guix system: Inline menu-entries in to 
bootcfg in perform-action.
has caused the debbugs.gnu.org bug report #56122,
regarding [PATCH] guix system: Inline menu-entries in to bootcfg in 
perform-action.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
56122: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=56122
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] guix system: Inline menu-entries in to bootcfg in perform-action.
>
>
>
>
> Date: 
>
> Tue, 21 Jun 2022 12:19:00 +0100
>
>
>
>
> This avoids an exception when generating images, where the reading of boot
> parameters fails.
>
> * guix/scripts/system.scm (perform-action): Inline menu-entries in to bootcfg.
> ---
>  guix/scripts/system.scm | 11 +++++------
>  1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
> index 63e3b9b934..b9084a401c 100644
> --- a/guix/scripts/system.scm
> +++ b/guix/scripts/system.scm
> @@ -800,11 +800,6 @@ (define* (perform-action action image
>    (define println
>      (cut format #t "~a~%" <>))
>  
> -  (define menu-entries
> -    (if (eq? 'init action)
> -        '()
> -        (map boot-parameters->menu-entry (profile-boot-parameters))))
> -
>    (define os
>      (image-operating-system image))
>  
> @@ -813,7 +808,11 @@ (define bootloader
>  
>    (define bootcfg
>      (and (memq action '(init reconfigure))
> -         (operating-system-bootcfg os menu-entries)))
> +         (operating-system-bootcfg
> +          os
> +          (if (eq? action 'init)
> +              '()
> +              (map boot-parameters->menu-entry (profile-boot-parameters))))))
>  
>    (when (eq? action 'reconfigure)
>      (maybe-suggest-running-guix-pull)
> -- 
> 2.36.1
>
>
>
>
> --- End Message ---

--- Begin Message --- Subject: Re: [bug#56122] [PATCH] guix system: Inline menu-entries in to bootcfg in perform-action. Date: Thu, 23 Jun 2022 13:09:27 +0100 User-agent: mu4e 1.6.10; emacs 28.1

Josselin Poiret <dev@jpoiret.xyz> writes:

> Hello Christopher,
>
> Christopher Baines <mail@cbaines.net> writes:
>> This avoids an exception when generating images, where the reading of boot
>> parameters fails.
>>
>> * guix/scripts/system.scm (perform-action): Inline menu-entries in to 
>> bootcfg.
>
> Good catch!  Seems good to me, except for the missing updated copyright
> notice at the top.

Thanks for taking a look. I've pushed this as
8e2ff622ed7e493a644ebcff62299d2ed1c4e806.

I forgot to update the copyright stuff, but I'll try and remember that
for next time.

Thanks again,

Chris

signature.asc
Description: PGP signature

--- End Message ---