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

services: file-system-shepherd-service: Make it find the fsck programs. 

Fixes <https://bugs.gnu.org/25917>.

* gnu/services/base.scm (file-system-shepherd-service): Use
file-system-packages.
This commit is contained in:
Danny Milosavljevic 2017-03-18 15:06:32 +01:00
parent 7c86c03109
commit 26e34e1e12
No known key found for this signature in database
GPG Key ID: E71A35542C30BAA5
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gnu/services/base.scm
View File

@ -274,7 +274,8 @@ FILE-SYSTEM."
(options (file-system-options file-system)) (options (file-system-options file-system))
(check? (file-system-check? 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))))
(and (file-system-mount? file-system) (and (file-system-mount? file-system)
(with-imported-modules '((gnu build file-systems) (with-imported-modules '((gnu build file-systems)
(guix build bournish)) (guix build bournish))
@ -292,11 +293,12 @@ FILE-SYSTEM."
;; Make sure fsck.ext2 & co. can be found. ;; Make sure fsck.ext2 & co. can be found.
(dynamic-wind (dynamic-wind
(lambda () (lambda ()
(setenv "PATH" ;; Don’t display the PATH settings.
(string-append (with-output-to-port (%make-void-port "w")
#$e2fsprogs "/sbin:" (lambda ()
"/run/current-system/profile/sbin:" (set-path-environment-variable "PATH"
$PATH))) '("bin" "sbin")
'#$packages))))
(lambda () (lambda ()
(mount-file-system (mount-file-system
`(#$device #$title #$target #$type #$flags `(#$device #$title #$target #$type #$flags