~ruther/guix-local: system: Use grub from bootloader configuration.

81bf2ccbc408fc2e959d3f5ab019938dad2ce616 — Marius Bakke 9 years ago 842a140

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 <dannym@scratchpost.org>

patch browse .tar.gz

2 files changed, 3 insertions(+), 2 deletions(-)

M gnu/system/grub.scm
M guix/scripts/system.scm

M gnu/system/grub.scm => gnu/system/grub.scm +1 -0

@@ 51,6 51,7 @@
             grub-configuration
             grub-configuration?
             grub-configuration-device
+            grub-configuration-grub
 
             menu-entry
             menu-entry?

M guix/scripts/system.scm => guix/scripts/system.scm +2 -2

@@ 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