aboutsummaryrefslogtreecommitdiff
path: root/gnu/system
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-06-08 15:09:37 +0200
committerLudovic Courtès <ludo@gnu.org>2018-06-08 15:23:39 +0200
commitfb126314f85fbe7bf7749a65cc6e10c57aa34023 (patch)
tree7e1f7cef73ad08965e226f2b7b96d83727c0d947 /gnu/system
parent50e53c1c678810ef2b6efc47221ffe2d1a3c6cf0 (diff)
downloadguix-fb126314f85fbe7bf7749a65cc6e10c57aa34023.tar
guix-fb126314f85fbe7bf7749a65cc6e10c57aa34023.tar.gz
vm: 'iso9660-image' uses a local /tmp.
Fixes <https://bugs.gnu.org/31752>. Regression introduced in commit 8c9bf2946a1cb58c5b7b941db3a37830ece80708. * gnu/system/vm.scm (iso9660-image): Pass #:file-systems to 'expression->derivation-in-linux-vm'.
Diffstat (limited to 'gnu/system')
-rw-r--r--gnu/system/vm.scm8
1 files changed, 8 insertions, 0 deletions
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 4a159d6159..544c0e294d 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -260,6 +260,14 @@ INPUTS is a list of inputs (as for packages)."
uuid-bytevector))
(reboot))))
#:system system
+
+ ;; Keep a local file system for /tmp so that we can populate it directly as
+ ;; root and have files owned by root. See <https://bugs.gnu.org/31752>.
+ #:file-systems (remove (lambda (file-system)
+ (string=? (file-system-mount-point file-system)
+ "/tmp"))
+ %linux-vm-file-systems)
+
#:make-disk-image? #f
#:single-file-output? #t
#:references-graphs inputs))