* [PATCH] system: Use grub from bootloader configuration.
@ 2016-11-07 12:38 Marius Bakke
0 siblings, 0 replies; only message in thread
From: Marius Bakke @ 2016-11-07 12:38 UTC (permalink / raw)
To: guix-devel; +Cc: Marius Bakke
* 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(-)
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
--
2.10.2
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2016-11-07 12:38 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-07 12:38 [PATCH] system: Use grub from bootloader configuration Marius Bakke
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).