From cf189709bcbc96e0e24c132f2a55a5347531ab44 Mon Sep 17 00:00:00 2001
From: Danny Milosavljevic <dannym@scratchpost.org>
Date: Fri, 21 Jul 2017 01:06:48 +0200
Subject: vm: Use grub-hybrid's grub-mkrescue.

* gnu/system/vm.scm (system-disk-image): Use grub-hybrid's grub-mkrescue.
* gnu/bootlader/grub.scm (grub-mkrescue-bootloader): New variable.
---
 gnu/bootloader/grub.scm | 6 ++++++
 gnu/system/vm.scm       | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm
index 3a3456ca46..ef62fe059b 100644
--- a/gnu/bootloader/grub.scm
+++ b/gnu/bootloader/grub.scm
@@ -55,6 +55,7 @@
 
             grub-bootloader
             grub-efi-bootloader
+            grub-mkrescue-bootloader
 
             grub-configuration))
 
@@ -410,6 +411,11 @@ submenu \"GNU system, old configurations...\" {~%")
    (name 'grub-efi)
    (package grub-efi)))
 
+(define* grub-mkrescue-bootloader
+  (bootloader
+   (inherit grub-efi-bootloader)
+   (package grub-hybrid)))
+
 
 ;;;
 ;;; Compatibility macros.
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 90d29b0783..4494af0031 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -49,6 +49,7 @@
   #:use-module (gnu packages admin)
 
   #:use-module (gnu bootloader)
+  #:use-module ((gnu bootloader grub) #:select (grub-mkrescue-bootloader))
   #:use-module (gnu system shadow)
   #:use-module (gnu system pam)
   #:use-module (gnu system linux-initrd)
@@ -369,6 +370,12 @@ to USB sticks meant to be read-only."
                                #:volatile-root? #t
                                rest)))
 
+              (bootloader (if (string=? "iso9660" file-system-type)
+                              (bootloader-configuration
+                                (inherit (operating-system-bootloader os))
+                                (bootloader grub-mkrescue-bootloader))
+                              (operating-system-bootloader os)))
+
               ;; Force our own root file system.
               (file-systems (cons (file-system
                                     (mount-point "/")
-- 
cgit v1.2.3

mit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=99b73d0f0ce9fdb397fdf211839d73f98e3ddec2'>root</a>/<a href='/guix/log/etc?id=99b73d0f0ce9fdb397fdf211839d73f98e3ddec2'>etc</a>/<a href='/guix/log/etc/guix-daemon.service.in?id=99b73d0f0ce9fdb397fdf211839d73f98e3ddec2'>guix-daemon.service.in</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/etc/guix-daemon.service.in?id=99b73d0f0ce9fdb397fdf211839d73f98e3ddec2&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-06-05 11:48:55 +0200'>2019-06-05</span></td><td><a href='/guix/commit/etc/guix-daemon.service.in?id=579d17b70dac067f8194ede46513400b91ac136a'>etc: guix-daemon.service.in: Fix GUIX_LOCPATH quoting.</a><span class='msg-avail'>...</span></td><td>Jack Hill</td></tr>
<tr><td><span title='2019-05-13 23:46:08 +0200'>2019-05-13</span></td><td><a href='/guix/commit/etc/guix-daemon.service.in?id=489d6c0dc03f1d95a3fefa6301f36cac9b50b2c3'>Set 'LC_ALL=en_US.utf8' in systemd '.service' files.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-11-23 15:42:01 +0100'>2018-11-23</span></td><td><a href='/guix/commit/etc/guix-daemon.service.in?id=e9926f80c6553fde50ce1fcfd38d6370f841efd2'>build: Binary tarball now populates the "current-guix" profile.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-04-22 20:45:08 -0400'>2017-04-22</span></td><td><a href='/guix/commit/etc/guix-daemon.service.in?id=644f95111cd3566b2136f935624a82210eec2c8a'>Increase "TasksMax" in 'guix-daemon.service'.</a><span class='msg-avail'>...</span></td><td>Sergei Trofimovich</td></tr>
<tr><td><span title='2017-03-06 13:25:51 -0500'>2017-03-06</span></td><td><a href='/guix/commit/etc/guix-daemon.service.in?id=613d0895b92c677e0639d5e77c55043e38e020c8'>build: Don't embed absolute paths in .service and .conf service files.</a><span class='msg-avail'>...</span></td><td>Leo Famulari</td></tr>