From: "Jan (janneke) Nieuwenhuizen" <janneke@gnu.org>
To: 42122@debbugs.gnu.org
Subject: [bug#42122] [PATCH 1/3] system: 'read-boot-parameters' fixes for multiboot.
Date: Mon, 29 Jun 2020 15:58:15 +0200 [thread overview]
Message-ID: <20200629135817.12784-1-janneke@gnu.org> (raw)
In-Reply-To: <20200629135559.12696-1-janneke@gnu.org>
* gnu/system.scm (read-boot-parameters): Allow initrd to be unset. Return
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)))
- (multiboot-modules (or (assq 'multiboot-modules rest) '()))
+ (multiboot-modules
+ (match (assq 'multiboot-modules rest)
+ ((_ args) args)
+ (#f '())))
(store-device
;; Linux device names like "/dev/sda1" are not suitable GRUB device
--
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-06-29 13:59 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-29 13:55 [bug#42122] [PATCH 0/3] Support guix system describe and provenance for the Hurd Jan (janneke) Nieuwenhuizen
2020-06-29 13:58 ` Jan (janneke) Nieuwenhuizen [this message]
2020-06-29 13:58 ` [bug#42122] [PATCH 2/3] services: system-service-type: Add entries support " Jan (janneke) Nieuwenhuizen
2020-07-02 21:50 ` Ludovic Courtès
2020-07-03 7:42 ` Jan Nieuwenhuizen
2020-06-29 13:58 ` [bug#42122] [PATCH 3/3] guix system: "describe" displays multiboot info Jan (janneke) Nieuwenhuizen
2020-07-02 21:51 ` Ludovic Courtès
2020-07-03 7:42 ` bug#42122: " Jan Nieuwenhuizen
2020-07-02 21:42 ` [bug#42122] [PATCH 1/3] system: 'read-boot-parameters' fixes for multiboot Ludovic Courtès
2020-07-03 7:42 ` 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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200629135817.12784-1-janneke@gnu.org \
--to=janneke@gnu.org \
--cc=42122@debbugs.gnu.org \
/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 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).