diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-10-03 23:25:38 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-10-11 11:12:33 +0200 |
| commit | 1c65cca5743e9171bbd94307195f123d26c0535e (patch) | |
| tree | 7ce49ab08817158f722d0a0129e54efc0ad170cc /gnu/services | |
| parent | f26af33aec586bafcf21838d6ed3b7e00e2b5b03 (diff) | |
| download | guix-1c65cca5743e9171bbd94307195f123d26c0535e.tar guix-1c65cca5743e9171bbd94307195f123d26c0535e.tar.gz | |
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.
Diffstat (limited to 'gnu/services')
| -rw-r--r-- | gnu/services/base.scm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 64620a9b0a..541ca76f14 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -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) |