aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2016-11-07 11:56:52 +0000
committerMarius Bakke <mbakke@fastmail.com>2016-11-08 14:35:05 +0000
commit81bf2ccbc408fc2e959d3f5ab019938dad2ce616 (patch)
tree8d60cab263206d02ebe085586de3d28b1b4e7bd5
parent842a1400a7caab2ecb03e9bc9223c7a575c02663 (diff)
downloadguix-81bf2ccbc408fc2e959d3f5ab019938dad2ce616.tar
guix-81bf2ccbc408fc2e959d3f5ab019938dad2ce616.tar.gz
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>
-rw-r--r--gnu/system/grub.scm1
-rw-r--r--guix/scripts/system.scm4
2 files changed, 3 insertions, 2 deletions
diff --git a/gnu/system/grub.scm b/gnu/system/grub.scm
index 5c9d0f15a1..4657b06b5f 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 df9b37d544..71ddccfa61 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