mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2026-05-27 19:41:50 +02:00
file-systems: 'mount-file-system' now takes a <file-system> object.
* gnu/build/file-systems.scm (mount-file-system): Rename 'spec' to 'fs' and assume it's a <file-system>. * gnu/build/linux-boot.scm (boot-system): Assume MOUNTS is a list of <file-system> and adjust accordingly. * gnu/build/linux-container.scm (mount-file-systems): Remove 'file-system->spec' call. * gnu/services/base.scm (file-system-shepherd-service): Add 'spec->file-system' call. Add (gnu system file-systems) to 'modules'. * gnu/system/linux-initrd.scm (raw-initrd): Use (gnu system file-systems). Add 'spec->file-system' call for #:mounts.
This commit is contained in:
@@ -307,7 +307,8 @@ FILE-SYSTEM."
|
||||
'#$packages))))
|
||||
(lambda ()
|
||||
(mount-file-system
|
||||
'#$(file-system->spec file-system)
|
||||
(spec->file-system
|
||||
'#$(file-system->spec file-system))
|
||||
#:root "/"))
|
||||
(lambda ()
|
||||
(setenv "PATH" $PATH)))
|
||||
@@ -322,9 +323,10 @@ FILE-SYSTEM."
|
||||
(umount #$target)
|
||||
#f))
|
||||
|
||||
;; We need an additional module.
|
||||
;; We need additional modules.
|
||||
(modules `(((gnu build file-systems)
|
||||
#:select (mount-file-system))
|
||||
(gnu system file-systems)
|
||||
,@%default-modules)))))))
|
||||
|
||||
(define (file-system-shepherd-services file-systems)
|
||||
|
||||
Reference in New Issue
Block a user