guix-commits
[Top][All Lists]
Advanced

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

04/06: system: hurd: Add hurd-grub-minimal-bootloader.


From: guix-commits
Subject: 04/06: system: hurd: Add hurd-grub-minimal-bootloader.
Date: Sat, 25 Apr 2020 09:33:28 -0400 (EDT)

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

commit 45342ffb4204e89660c4eb31c4ad28bcf012ee37
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Sat Apr 25 14:56:05 2020 +0200

    system: hurd: Add hurd-grub-minimal-bootloader.
    
    * gnu/system/hurd.scm (hurd-grub-minimal-bootloader): New variable.
    (%hurd-default-operating-system): Use it.
---
 gnu/system/hurd.scm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm
index b40aa64..05ae9e0 100644
--- a/gnu/system/hurd.scm
+++ b/gnu/system/hurd.scm
@@ -26,6 +26,7 @@
   #:use-module (guix packages)
   #:use-module (guix profiles)
   #:use-module (guix utils)
+  #:use-module (gnu bootloader)
   #:use-module (gnu bootloader grub)
   #:use-module (gnu packages admin)
   #:use-module (gnu packages base)
@@ -105,7 +106,6 @@
                                        #:key
                                        (system (%current-system))
                                        (old-entries '()))
-  (pk "hurd-grub-configuration-file")
   (let ((hurd (if (equal? system (%current-system))
                   hurd
                   (with-parameters ((%current-target-system system))
@@ -135,10 +135,17 @@ menuentry \"GNU\" {
                                  #+mach #+mach #+hurd
                                  #+libc #+hurd))))))
 
+(define hurd-grub-minimal-bootloader
+  (bootloader
+   (inherit grub-minimal-bootloader)
+   (configuration-file-generator hurd-grub-configuration-file)))
+
 (define %hurd-default-operating-system
   (operating-system
     (host-name "guixygnu")
-    (bootloader #f)
+    (bootloader (bootloader-configuration
+                 (bootloader hurd-grub-minimal-bootloader)
+                 (target "/dev/vda")))
     (kernel hurd)
     (firmware '())
     (initrd (lambda _ '()))



reply via email to

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