diff options
| author | Danny Milosavljevic <dannym@scratchpost.org> | 2017-07-21 01:06:48 +0200 |
|---|---|---|
| committer | Danny Milosavljevic <dannym@scratchpost.org> | 2017-08-03 18:13:03 +0200 |
| commit | cf189709bcbc96e0e24c132f2a55a5347531ab44 (patch) | |
| tree | 5be2bed088726f83b51af7c71b5af29b2d5a3ba9 | |
| parent | 2267e4d3f64c9224997f8d48d69c505fa91c9aa6 (diff) | |
| download | patches-cf189709bcbc96e0e24c132f2a55a5347531ab44.tar patches-cf189709bcbc96e0e24c132f2a55a5347531ab44.tar.gz | |
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.
| -rw-r--r-- | gnu/bootloader/grub.scm | 6 | ||||
| -rw-r--r-- | gnu/system/vm.scm | 7 |
2 files changed, 13 insertions, 0 deletions
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 "/") |