guix-devel
[Top][All Lists]
Advanced

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

[PATCH] system: Use grub from bootloader configuration.


From: Marius Bakke
Subject: [PATCH] system: Use grub from bootloader configuration.
Date: Mon, 7 Nov 2016 12:38:06 +0000

* gnu/system/grub.scm (gnu): Export grub-configuration-grub.
* guix/scripts/system.scm (perform-action): Use it.

Co-authored-by: Danny Milosavljevic <address@hidden>
---
 gnu/system/grub.scm     | 1 +
 guix/scripts/system.scm | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/system/grub.scm b/gnu/system/grub.scm
index 5c9d0f1..4657b06 100644
--- a/gnu/system/grub.scm
+++ b/gnu/system/grub.scm
@@ -51,6 +51,7 @@
             grub-configuration
             grub-configuration?
             grub-configuration-device
+            grub-configuration-grub
 
             menu-entry
             menu-entry?
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index df9b37d..9b7cb71 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -617,7 +617,8 @@ building anything."
                                                 #:image-size image-size
                                                 #:full-boot? full-boot?
                                                 #:mappings mappings))
-       (grub      (package->derivation grub))
+       (grub      (package->derivation (grub-configuration-grub
+                                        (operating-system-bootloader os))))
        (grub.cfg  (if (eq? 'container action)
                       (return #f)
                       (operating-system-grub.cfg os
-- 
2.10.2




reply via email to

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