guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/04: system: 'read-boot-parameters' bugfix for multiboot.


From: guix-commits
Subject: 01/04: system: 'read-boot-parameters' bugfix for multiboot.
Date: Fri, 3 Jul 2020 03:41:53 -0400 (EDT)

janneke pushed a commit to branch master
in repository guix.

commit aa864ebdb01a7685401e2b143cb359b12175b46e
Author: Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Mon Jun 29 15:24:45 2020 +0200

    system: 'read-boot-parameters' bugfix for multiboot.
    
    * gnu/system.scm (read-boot-parameters): Oops, only return value for
    multiboot-modules instead of (key value).
---
 gnu/system.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/system.scm b/gnu/system.scm
index 44baace..6a39931 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -353,7 +353,10 @@ file system labels."
          (('initrd (? string? file))
           file)))
 
-      (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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]