01/01: system: Use grub from bootloader configuration.

[Marius Bakke]

mbakke pushed a commit to branch master
in repository guix.

commit 81bf2ccbc408fc2e959d3f5ab019938dad2ce616
Author: Marius Bakke <address@hidden>
Date:   Mon Nov 7 11:56:52 2016 +0000

    system: Use grub from bootloader configuration.
    
    * gnu/system/grub.scm (gnu): Export grub-configuration-grub.
    * guix/scripts/system.scm (perform-action): Use it.
    (define-module): Don't import (gnu packages grub).
    
    Co-authored-by: Danny Milosavljevic <address@hidden>
---
 gnu/system/grub.scm     |    1 +
 guix/scripts/system.scm |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

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..71ddccf 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -44,7 +44,6 @@
   #:use-module (gnu services)
   #:use-module (gnu services shepherd)
   #:use-module (gnu services herd)
-  #:use-module (gnu packages grub)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-11)
   #:use-module (srfi srfi-19)
@@ -617,7 +616,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