@@ -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>
@@ -508,6 +509,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.
@@ -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.