[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/06: vm: Fix 'load-in-linux-vm' docstring.
From: |
Ludovic Courtès |
Subject: |
02/06: vm: Fix 'load-in-linux-vm' docstring. |
Date: |
Thu, 29 Jun 2017 18:17:55 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 6efb98ed3cc0ff4b2a35f4a08651d5ad15d1a9cd
Author: Ludovic Courtès <address@hidden>
Date: Thu Jun 29 23:11:23 2017 +0200
vm: Fix 'load-in-linux-vm' docstring.
* gnu/build/vm.scm (load-in-linux-vm): Change default value of
#:disk-image-size. Update docstring to note that DISK-IMAGE-SIZE is
in bytes.
---
gnu/build/vm.scm | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm
index 5761976..56ebeae 100644
--- a/gnu/build/vm.scm
+++ b/gnu/build/vm.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <address@hidden>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <address@hidden>
;;; Copyright © 2016 Christopher Allan Webber <address@hidden>
;;; Copyright © 2016 Leo Famulari <address@hidden>
;;; Copyright © 2017 Mathieu Othacehe <address@hidden>
@@ -71,15 +71,16 @@
output
(qemu (qemu-command)) (memory-size 512)
linux initrd
- make-disk-image? (disk-image-size 100)
+ make-disk-image?
+ (disk-image-size (* 100 (expt 2 20)))
(disk-image-format "qcow2")
(references-graphs '()))
"Run BUILDER, a Scheme file, into a VM running LINUX with INITRD, and copy
the result to OUTPUT.
When MAKE-DISK-IMAGE? is true, OUTPUT will contain a VM image of
-DISK-IMAGE-SIZE MiB resulting from the execution of BUILDER, which may access
-it via /dev/hda.
+DISK-IMAGE-SIZE bytes resulting from the execution of BUILDER, which may
+access it via /dev/hda.
REFERENCES-GRAPHS can specify a list of reference-graph files as produced by
the #:references-graphs parameter of 'derivation'."
- branch master updated (95bbaa0 -> 79bfa63), Ludovic Courtès, 2017/06/29
- 03/06: vm: Display the disk and partition sizes., Ludovic Courtès, 2017/06/29
- 06/06: maint: Disk image size is automatically guessed., Ludovic Courtès, 2017/06/29
- 02/06: vm: Fix 'load-in-linux-vm' docstring.,
Ludovic Courtès <=
- 05/06: vm: Use 'fold2' from (guix combinators)., Ludovic Courtès, 2017/06/29
- 01/06: build: Remove check for broken (srfi srfi-37)., Ludovic Courtès, 2017/06/29
- 04/06: vm: Estimate the disk size by default., Ludovic Courtès, 2017/06/29