From fb126314f85fbe7bf7749a65cc6e10c57aa34023 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 8 Jun 2018 15:09:37 +0200
Subject: [PATCH] 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'.
---
 gnu/system/vm.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

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))