[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/05: vm: 'expression->derivation-in-linux-vm' takes a #:file-systems p
From: |
Ludovic Courtès |
Subject: |
04/05: vm: 'expression->derivation-in-linux-vm' takes a #:file-systems parameter. |
Date: |
Fri, 8 Jun 2018 09:23:47 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 50e53c1c678810ef2b6efc47221ffe2d1a3c6cf0
Author: Ludovic Courtès <address@hidden>
Date: Fri Jun 8 14:51:33 2018 +0200
vm: 'expression->derivation-in-linux-vm' takes a #:file-systems parameter.
* gnu/system/vm.scm (expression->derivation-in-linux-vm): Add
#:file-systems and use it instead of %LINUX-VM-FILE-SYSTEMS.
---
gnu/system/vm.scm | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 8cfbda2..4a159d6 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -125,6 +125,8 @@
(env-vars '())
(guile-for-build
(%guile-for-build))
+ (file-systems
+ %linux-vm-file-systems)
(single-file-output? #f)
(make-disk-image? #f)
@@ -134,8 +136,9 @@
(disk-image-size 'guess))
"Evaluate EXP in a QEMU virtual machine running LINUX with INITRD (a
derivation). The virtual machine runs with MEMORY-SIZE MiB of memory. In the
-virtual machine, EXP has access to all its inputs from the store; it should
-put its output file(s) in the '/xchg' directory.
+virtual machine, EXP has access to FILE-SYSTEMS, which, by default, includes a
+9p share of the store, the '/xchg' where EXP should put its output file(s),
+and a 9p share of /tmp.
If SINGLE-FILE-OUTPUT? is true, copy a single file from '/xchg' to OUTPUT.
Otherwise, copy the contents of /xchg to a new directory OUTPUT.
@@ -155,7 +158,7 @@ made available under the /xchg CIFS share."
(coreutils -> (canonical-package coreutils))
(initrd (if initrd ; use the default initrd?
(return initrd)
- (base-initrd %linux-vm-file-systems
+ (base-initrd file-systems
#:on-error 'backtrace
#:linux linux
#:linux-modules %base-initrd-modules