nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Marius Bakke 2016-11-07 11:56:52 +00:00
parent 842a1400a7
commit 81bf2ccbc4
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gnu/system/grub.scm
View File

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

4
guix/scripts/system.scm
View File

@ -44,7 +44,6 @@
#:use-module (gnu services) #:use-module (gnu services)
#:use-module (gnu services shepherd) #:use-module (gnu services shepherd)
#:use-module (gnu services herd) #:use-module (gnu services herd)
#:use-module (gnu packages grub)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (srfi srfi-11) #:use-module (srfi srfi-11)
#:use-module (srfi srfi-19) #:use-module (srfi srfi-19)
@ -617,7 +616,8 @@ building anything."
#:image-size image-size #:image-size image-size
#:full-boot? full-boot? #:full-boot? full-boot?
#:mappings mappings)) #:mappings mappings))
(grub (package->derivation grub)) (grub (package->derivation (grub-configuration-grub
(operating-system-bootloader os))))
(grub.cfg (if (eq? 'container action) (grub.cfg (if (eq? 'container action)
(return #f) (return #f)
(operating-system-grub.cfg os (operating-system-grub.cfg os