guix-commits
[Top][All Lists]
Advanced

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

03/06: squash! bootloader: grub: Add support for multiboot.


From: guix-commits
Subject: 03/06: squash! bootloader: grub: Add support for multiboot.
Date: Sat, 30 May 2020 06:15:57 -0400 (EDT)

janneke pushed a commit to branch wip-hurd-vm
in repository guix.

commit c3d7445e9fbfa26ce0e6a87b010da48bf987ef92
Author: Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Sat May 30 09:31:58 2020 +0200

    squash! bootloader: grub: Add support for multiboot.
---
 gnu/bootloader/grub.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm
index 1a8ff81..2d847bf 100644
--- a/gnu/bootloader/grub.scm
+++ b/gnu/bootloader/grub.scm
@@ -356,14 +356,14 @@ Btrfs root file system resides."
                    #$(grub-root-search device linux)
                    #$linux (string-join (list #$@arguments))
                    #$initrd)))
-      (($ <menu-entry> label device mount-point #f () #f kernel modules)
+      (($ <menu-entry> label device mount-point #f () #f kernel arguments 
modules)
        (let* ((target (%current-target-system)))
          #~(format port "
 menuentry ~s {
-  multiboot ~a root=device:hd0s1~a
+  multiboot ~a root=device:hd0s1~a~a
 }~%"
                    #$label
-                   #$kernel
+                   #$kernel (string-join (list #$@arguments) " " 'prefix)
                    (string-join (map string-join '#$modules)
                                 "\n  module " 'prefix))))))
 



reply via email to

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