nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

services: file-system: Use 'file-system->spec'. 

* gnu/services/base.scm (file-system-shepherd-service): Use
'file-system->spec' instead of in-line code.
This commit is contained in:
Ludovic Courtès 2017-09-06 09:22:59 +02:00
parent 47cef4ecad
commit d1ff5f9db3
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gnu/services/base.scm
View File

@ -29,6 +29,7 @@
#:use-module (gnu services networking) #:use-module (gnu services networking)
#:use-module (gnu system pam) #:use-module (gnu system pam)
#:use-module (gnu system shadow) ; 'user-account', etc. #:use-module (gnu system shadow) ; 'user-account', etc.
#:use-module (gnu system uuid)
#:use-module (gnu system file-systems) ; 'file-system', etc. #:use-module (gnu system file-systems) ; 'file-system', etc.
#:use-module (gnu system mapped-devices) #:use-module (gnu system mapped-devices)
#:use-module ((gnu system linux-initrd) #:use-module ((gnu system linux-initrd)
@ -277,12 +278,6 @@ FILE-SYSTEM."
"Return the shepherd service for @var{file-system}, or @code{#f} if "Return the shepherd service for @var{file-system}, or @code{#f} if
@var{file-system} is not auto-mounted upon boot." @var{file-system} is not auto-mounted upon boot."
(let ((target (file-system-mount-point file-system)) (let ((target (file-system-mount-point file-system))
(device (file-system-device file-system))
(type (file-system-type file-system))
(title (file-system-title file-system))
(flags (file-system-flags file-system))
(options (file-system-options file-system))
(check? (file-system-check? file-system))
(create? (file-system-create-mount-point? file-system)) (create? (file-system-create-mount-point? file-system))
(dependencies (file-system-dependencies file-system)) (dependencies (file-system-dependencies file-system))
(packages (file-system-packages (list file-system)))) (packages (file-system-packages (list file-system))))
@ -311,8 +306,7 @@ FILE-SYSTEM."
'#$packages)))) '#$packages))))
(lambda () (lambda ()
(mount-file-system (mount-file-system
`(#$device #$title #$target #$type #$flags '#$(file-system->spec file-system)
#$options #$check?)
#:root "/")) #:root "/"))
(lambda () (lambda ()
(setenv "PATH" $PATH))) (setenv "PATH" $PATH)))