Patchwork system: Use grub from bootloader configuration.

login
register
mail settings
Submitter Marius Bakke
Date Nov. 7, 2016, 12:38 p.m.
Message ID <20161107123806.18289-1-mbakke@fastmail.com>
Download mbox | patch
Permalink /patch/17259/
State New
Headers show

Comments

Marius Bakke - Nov. 7, 2016, 12:38 p.m.
* gnu/system/grub.scm (gnu): Export grub-configuration-grub.
* guix/scripts/system.scm (perform-action): Use it.

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

Patch

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