diff options
| author | Chris Marusich <cmmarusich@gmail.com> | 2018-03-15 05:09:12 +0100 |
|---|---|---|
| committer | Chris Marusich <cmmarusich@gmail.com> | 2018-03-24 03:04:10 +0100 |
| commit | 8c9bf2946a1cb58c5b7b941db3a37830ece80708 (patch) | |
| tree | 8b735f4a40acdd5e08cdf8afec2b369ed28be4a7 /gnu/system | |
| parent | af81311b8c7712db207927c8e7b8ed66602be5c7 (diff) | |
gnu: When building in a VM, share a temporary directory.
* gnu/build/vm.scm (load-in-linux-vm): Make a shared temporary directory
available in the VM.
* gnu/system/vm.scm (%linux-vm-file-systems): Add a corresponding entry.
Diffstat (limited to 'gnu/system')
| -rw-r--r-- | gnu/system/vm.scm | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 594ba66ff41..9d9eafc094d 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | ;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name> | 4 | ;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name> |
| 5 | ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> | 5 | ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> |
| 6 | ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> | 6 | ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> |
| 7 | ;;; Copyright © 2018 Chris Marusich <cmmarusich@gmail.com> | ||
| 7 | ;;; | 8 | ;;; |
| 8 | ;;; This file is part of GNU Guix. | 9 | ;;; This file is part of GNU Guix. |
| 9 | ;;; | 10 | ;;; |
| @@ -87,8 +88,8 @@ | |||
| 87 | ;;; Code: | 88 | ;;; Code: |
| 88 | 89 | ||
| 89 | (define %linux-vm-file-systems | 90 | (define %linux-vm-file-systems |
| 90 | ;; File systems mounted for 'derivation-in-linux-vm'. The store and /xchg | 91 | ;; File systems mounted for 'derivation-in-linux-vm'. These are shared with |
| 91 | ;; directory are shared with the host over 9p. | 92 | ;; the host over 9p. |
| 92 | (list (file-system | 93 | (list (file-system |
| 93 | (mount-point (%store-prefix)) | 94 | (mount-point (%store-prefix)) |
| 94 | (device "store") | 95 | (device "store") |
| @@ -102,6 +103,13 @@ | |||
| 102 | (type "9p") | 103 | (type "9p") |
| 103 | (needed-for-boot? #t) | 104 | (needed-for-boot? #t) |
| 104 | (options "trans=virtio") | 105 | (options "trans=virtio") |
| 106 | (check? #f)) | ||
| 107 | (file-system | ||
| 108 | (mount-point "/tmp") | ||
| 109 | (device "tmp") | ||
| 110 | (type "9p") | ||
| 111 | (needed-for-boot? #t) | ||
| 112 | (options "trans=virtio") | ||
| 105 | (check? #f)))) | 113 | (check? #f)))) |
| 106 | 114 | ||
| 107 | (define* (expression->derivation-in-linux-vm name exp | 115 | (define* (expression->derivation-in-linux-vm name exp |
