[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/04: vm: Reword grub.cfg to bootcfg.
From: |
Danny Milosavljevic |
Subject: |
03/04: vm: Reword grub.cfg to bootcfg. |
Date: |
Sat, 15 Apr 2017 08:43:12 -0400 (EDT) |
dannym pushed a commit to branch master
in repository guix.
commit 07f812c404cd05dcac0d2801ad476f6e367ca6d4
Author: Mathieu Othacehe <address@hidden>
Date: Sat Apr 15 14:22:24 2017 +0200
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 <address@hidden>
---
gnu/build/vm.scm | 9 +++++----
gnu/system/vm.scm | 9 +++++----
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm
index 44a3000..1eb9a4c 100644
--- a/gnu/build/vm.scm
+++ b/gnu/build/vm.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <address@hidden>
;;; Copyright © 2016 Christopher Allan Webber <address@hidden>
;;; Copyright © 2016 Leo Famulari <address@hidden>
+;;; Copyright © 2017 Mathieu Othacehe <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -284,18 +285,18 @@ SYSTEM-DIRECTORY is the name of the directory of the
'system' derivation."
(unless register-closures?
(reset-timestamps target))))
-(define (register-grub.cfg-root target grub.cfg)
- "On file system TARGET, register GRUB.CFG as a GC root."
+(define (register-grub.cfg-root target bootcfg)
+ "On file system TARGET, register BOOTCFG as a GC root."
(let ((directory (string-append target "/var/guix/gcroots")))
(mkdir-p directory)
- (symlink grub.cfg (string-append directory "/grub.cfg"))))
+ (symlink bootcfg (string-append directory "/grub.cfg"))))
(define* (initialize-hard-disk device
#:key
grub.cfg
(partitions '()))
"Initialize DEVICE as a disk containing all the <partition> objects listed
-in PARTITIONS, and using GRUB.CFG as its bootloader configuration file.
+in PARTITIONS, and using BOOTCFG as its bootloader configuration file.
Each partition is initialized by calling its 'initializer' procedure,
passing it a directory name where it is mounted."
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index ddb8981..374d8b6 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <address@hidden>
;;; Copyright © 2016 Christopher Allan Webber <address@hidden>
;;; Copyright © 2016 Leo Famulari <address@hidden>
+;;; Copyright © 2017 Mathieu Othacehe <address@hidden>
;;;
;;; 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.