[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#42122] [PATCH 1/3] system: 'read-boot-parameters' fixes for multibo
From: |
Ludovic Courtès |
Subject: |
[bug#42122] [PATCH 1/3] system: 'read-boot-parameters' fixes for multiboot. |
Date: |
Thu, 02 Jul 2020 23:42:58 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) |
Hi!
"Jan (janneke) Nieuwenhuizen" <janneke@gnu.org> skribis:
> * gnu/system.scm (read-boot-parameters): Allow initrd to be unset. Return
s/unset/missing/, right?
> only value for multiboot-modules instead of (key value).
> ---
> gnu/system.scm | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/system.scm b/gnu/system.scm
> index 44baacee7b..a6a9c958e6 100644
> --- a/gnu/system.scm
> +++ b/gnu/system.scm
> @@ -351,9 +351,13 @@ file system labels."
> (('initrd ('string-append directory file)) ;the old format
> (string-append directory file))
> (('initrd (? string? file))
> - file)))
> + file)
> + (#f #f)))
OK.
> - (multiboot-modules (or (assq 'multiboot-modules rest) '()))
> + (multiboot-modules
> + (match (assq 'multiboot-modules rest)
> + ((_ args) args)
> + (#f '())))
Since this second hunk is a bug fix, I’d rather make it a separate
commit.
Otherwise LGTM!
- [bug#42122] [PATCH 1/3] system: 'read-boot-parameters' fixes for multiboot.,
Ludovic Courtès <=