nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vm: Do not mount /xchg with "cache=loose". 

Fixes <https://bugs.gnu.org/33639>.

* gnu/system/vm.scm (%linux-vm-file-systems): Remove "cache=loose" for /xchg.
(system-docker-image): Remove 'sync' call, now unneeded, and which was
probably insufficient.
This commit is contained in:
Ludovic Courtès 2019-04-14 17:03:34 +02:00
parent 307ec7324b
commit 66ec389580
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gnu/system/vm.scm
View File

@ -94,6 +94,12 @@
(define %linux-vm-file-systems (define %linux-vm-file-systems
;; File systems mounted for 'derivation-in-linux-vm'. These are shared with ;; File systems mounted for 'derivation-in-linux-vm'. These are shared with
;; the host over 9p. ;; the host over 9p.
;;
;; The 9p documentation says that cache=loose is "intended for exclusive,
;; read-only mounts", without additional details. It's much faster than the
;; default cache=none, especially when copying and registering store items.
;; Thus, use cache=loose, except for /xchg where we want to ensure
;; consistency.
(list (file-system (list (file-system
(mount-point (%store-prefix)) (mount-point (%store-prefix))
(device "store") (device "store")
@ -102,18 +108,12 @@
(flags '(read-only)) (flags '(read-only))
(options "trans=virtio,cache=loose") (options "trans=virtio,cache=loose")
(check? #f)) (check? #f))
;; The 9p documentation says that cache=loose is "intended for
;; exclusive, read-only mounts", without additional details. In
;; practice it seems to work well for these, and it's much faster than
;; the default cache=none, especially when copying and registering
;; store items.
(file-system (file-system
(mount-point "/xchg") (mount-point "/xchg")
(device "xchg") (device "xchg")
(type "9p") (type "9p")
(needed-for-boot? #t) (needed-for-boot? #t)
(options "trans=virtio,cache=loose") (options "trans=virtio")
(check? #f)) (check? #f))
(file-system (file-system
(mount-point "/tmp") (mount-point "/tmp")
@ -530,10 +530,7 @@ should set REGISTER-CLOSURES? to #f."
#$os #$os
#:compressor '(#+(file-append gzip "/bin/gzip") "-9n") #:compressor '(#+(file-append gzip "/bin/gzip") "-9n")
#:creation-time (make-time time-utc 0 1) #:creation-time (make-time time-utc 0 1)
#:transformations `((,root-directory -> ""))) #:transformations `((,root-directory -> ""))))))))
;; Make sure the tarball is fully written before rebooting.
(sync))))))
(expression->derivation-in-linux-vm (expression->derivation-in-linux-vm
name build name build
#:make-disk-image? #f #:make-disk-image? #f