summaryrefslogtreecommitdiff
path: root/gnu/bootloader/grub.scm
diff options
context:
space:
mode:
authorJan (janneke) Nieuwenhuizen <janneke@gnu.org>2020-05-23 11:30:17 +0200
committerGuix Patches Tester <>2020-05-24 21:36:10 +0100
commit15ee02b8f231beb94e2e6fb350ec49ac71908317 (patch)
tree1d90ff3d47ed87436a5ae49f3cde8393bc13bb5a /gnu/bootloader/grub.scm
parent5733d204eeb44e6954dce6abf073b095e19ebffa (diff)
downloadpatches-15ee02b8f231beb94e2e6fb350ec49ac71908317.tar
patches-15ee02b8f231beb94e2e6fb350ec49ac71908317.tar.gz
system: vm: Build vm-image using native qemu, for the Hurd.series-4069
Cross-building a vm-image is usually done using a cross-qemu, e.g, qemu-ARM, because, e.g., a native, x86_64 Grub cannot install an armhf-Grub. That solution does not work for the Hurd, as there is no qemu-HURD. This patch enables cross building vm-images for the Hurd using a native qemu vm. * gnu/system/vm.scm (expression->derivation-in-linux-vm): Run native qemu-command; use native linux, initrd, bootloader-package and bootloader-installer, for the Hurd. [preserve-target]: New helper to install cross-packages into the native vm. * gnu/bootloader/grub.scm (eye-candy): Use native font. Co-authored-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu/bootloader/grub.scm')
-rw-r--r--gnu/bootloader/grub.scm4
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm
index bb40c551a7..ccf70b3785 100644
--- a/gnu/bootloader/grub.scm
+++ b/gnu/bootloader/grub.scm
@@ -207,8 +207,8 @@ else
set menu_color_highlight=white/blue
fi~%"
#$setup-gfxterm-body
- #$(grub-root-search store-device font-file)
- #$(setup-gfxterm config font-file)
+ #+(grub-root-search store-device font-file)
+ #+(setup-gfxterm config font-file)
#$(grub-setup-io config)
#$image