mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-19 14:07:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: file-systems: Add variable %base-live-file-systems.

Browse source 
* 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>
This commit is contained in:
Nicolas Graves 2023-07-27 13:59:08 +02:00 committed by Ludovic Courtès
parent d2a751c14e
commit d4da1f26e1
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gnu/system/file-systems.scm
View file

@ -85,6 +85,7 @@ (define-module (gnu system file-systems)
%elogind-file-systems %elogind-file-systems
%base-file-systems %base-file-systems
%base-live-file-systems
%container-file-systems %container-file-systems
<file-system-mapping> <file-system-mapping>
@ -495,6 +496,26 @@ (define %base-file-systems
%efivars-file-system %efivars-file-system
%immutable-store)) %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 ;; File systems for Linux containers differ from %base-file-systems in that
;; they impose additional restrictions such as no-exec or need different ;; they impose additional restrictions such as no-exec or need different
;; options to function properly. ;; options to function properly.

17
gnu/system/install.scm
View file

@ -517,22 +517,7 @@ (define installation-os
(file-systems (file-systems
;; Note: the disk image build code overrides this root file system with ;; Note: the disk image build code overrides this root file system with
;; the appropriate one. ;; the appropriate one.
(cons* (file-system (append %base-live-file-systems
(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))
;; XXX: This should be %BASE-FILE-SYSTEMS but we don't need ;; XXX: This should be %BASE-FILE-SYSTEMS but we don't need
;; elogind's cgroup file systems. ;; elogind's cgroup file systems.