diff options
| author | Mathieu Othacehe <m.othacehe@gmail.com> | 2017-04-15 14:22:24 +0200 |
|---|---|---|
| committer | Danny Milosavljevic <dannym@scratchpost.org> | 2017-04-15 14:42:15 +0200 |
| commit | 07f812c404cd05dcac0d2801ad476f6e367ca6d4 (patch) | |
| tree | 0d372745ec6c4a5ead79be7361d9fbe13f88c2ff /gnu/system/vm.scm | |
| parent | c76b3046f651e8f46db1a093fdfc78cdc0bc3a13 (diff) | |
| download | gnu-guix-07f812c404cd05dcac0d2801ad476f6e367ca6d4.tar gnu-guix-07f812c404cd05dcac0d2801ad476f6e367ca6d4.tar.gz | |
vm: Reword grub.cfg to bootcfg.
* gnu/build/vm.scm (register-grub.cfg-root): Reword grub.cfg to bootcfg,
(initialize-hard-disk): ditto,
* gnu/system/vm.scm (system-disk-image): ditto,
(system-qemu-image): ditto,
(system-qemu-image/shared-store): ditto.
Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
Diffstat (limited to 'gnu/system/vm.scm')
| -rw-r--r-- | gnu/system/vm.scm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index ddb8981ec8..374d8b6636 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org> ;;; Copyright © 2016 Leo Famulari <leo@famulari.name> +;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -295,7 +296,7 @@ to USB sticks meant to be read-only." #:copy-inputs? #t #:register-closures? #t #:inputs `(("system" ,os-drv) - ("grub.cfg" ,bootcfg)))))) + ("bootcfg" ,bootcfg)))))) (define* (system-qemu-image os #:key @@ -334,7 +335,7 @@ of the GNU system as described by OS." #:disk-image-size disk-image-size #:file-system-type file-system-type #:inputs `(("system" ,os-drv) - ("grub.cfg" ,bootcfg)) + ("bootcfg" ,bootcfg)) #:copy-inputs? #t)))) @@ -425,14 +426,14 @@ bootloader refers to: OS kernel, initrd, bootloader data, etc." (mlet* %store-monad ((os-drv (operating-system-derivation os)) (bootcfg (operating-system-bootcfg os))) ;; XXX: When FULL-BOOT? is true, we end up creating an image that contains - ;; GRUB.CFG and all its dependencies, including the output of OS-DRV. + ;; BOOTCFG and all its dependencies, including the output of OS-DRV. ;; This is more than needed (we only need the kernel, initrd, GRUB for its ;; font, and the background image), but it's hard to filter that. (qemu-image #:os-derivation os-drv #:grub-configuration bootcfg #:disk-image-size disk-image-size #:inputs (if full-boot? - `(("grub.cfg" ,bootcfg)) + `(("bootcfg" ,bootcfg)) '()) ;; XXX: Passing #t here is too slow, so let it off by default. |