[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: |
Jan (janneke) Nieuwenhuizen |
|
Subject: |
[bug#42122] [PATCH 1/3] system: 'read-boot-parameters' fixes for multiboot. |
|
Date: |
Mon, 29 Jun 2020 15:58:15 +0200 |
* 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