From d4da1f26e1c3fdb2b5d1d8f67ebd195d119fa964 Mon Sep 17 00:00:00 2001
From: Nicolas Graves <ngraves@ngraves.fr>
Date: Thu, 27 Jul 2023 13:59:08 +0200
Subject: gnu: file-systems: Add variable %base-live-file-systems.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/system/file-systems.scm (%base-live-file-systems): New variable.
* gnu/system/install.scm (installation-os): Use %base-live-file-systems.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/system/file-systems.scm | 21 +++++++++++++++++++++
 gnu/system/install.scm      | 17 +----------------
 2 files changed, 22 insertions(+), 16 deletions(-)

(limited to 'gnu/system')

diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm
index 95b757a698..529f1536de 100644
--- a/gnu/system/file-systems.scm
+++ b/gnu/system/file-systems.scm
@@ -85,6 +85,7 @@ (define-module (gnu system file-systems)
             %elogind-file-systems
 
             %base-file-systems
+            %base-live-file-systems
             %container-file-systems
 
             <file-system-mapping>
@@ -495,6 +496,26 @@ (define %base-file-systems
         %efivars-file-system
         %immutable-store))
 
+(define %base-live-file-systems
+  ;; This is the bare minimum to use live file-systems.
+  ;; Used in installation-os.
+  (list (file-system
+          (mount-point "/")
+          (device (file-system-label "Guix_image"))
+          (type "ext4"))
+
+        ;; Make /tmp a tmpfs instead of keeping the overlayfs.  This
+        ;; originally was used for unionfs because FUSE creates
+        ;; '.fuse_hiddenXYZ' files for each open file, and this confuses
+        ;; Guix's test suite, for instance (see
+        ;; <http://bugs.gnu.org/23056>).  We keep this for overlayfs to be
+        ;; on the safe side.
+        (file-system
+          (mount-point "/tmp")
+          (device "none")
+          (type "tmpfs")
+          (check? #f))))
+
 ;; File systems for Linux containers differ from %base-file-systems in that
 ;; they impose additional restrictions such as no-exec or need different
 ;; options to function properly.
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index 7a68c19606..28161de153 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -517,22 +517,7 @@ (define installation-os
     (file-systems
      ;; Note: the disk image build code overrides this root file system with
      ;; the appropriate one.
-     (cons* (file-system
-              (mount-point "/")
-              (device (file-system-label "Guix_image"))
-              (type "ext4"))
-
-            ;; Make /tmp a tmpfs instead of keeping the overlayfs.  This
-            ;; originally was used for unionfs because FUSE creates
-            ;; '.fuse_hiddenXYZ' files for each open file, and this confuses
-            ;; Guix's test suite, for instance (see
-            ;; <http://bugs.gnu.org/23056>).  We keep this for overlayfs to be
-            ;; on the safe side.
-            (file-system
-              (mount-point "/tmp")
-              (device "none")
-              (type "tmpfs")
-              (check? #f))
+     (append %base-live-file-systems
 
             ;; XXX: This should be %BASE-FILE-SYSTEMS but we don't need
             ;; elogind's cgroup file systems.
-- 
cgit v1.2.3