diff options
| author | Mark H Weaver <mhw@netris.org> | 2017-03-19 18:52:01 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2017-03-19 18:52:12 -0400 |
| commit | f67337e23ec16b1e05fcdcc7953f68f13ed6770a (patch) | |
| tree | 766e98a6c4695228f0a066accf91f639791dad68 /gnu/services/base.scm | |
| parent | b99eec83b861f6bee7afb7bd6ffcbdddd8f62b65 (diff) | |
| parent | e05fc441cd5528ba6c83b6371c27c1e87dd393e9 (diff) | |
| download | patches-f67337e23ec16b1e05fcdcc7953f68f13ed6770a.tar patches-f67337e23ec16b1e05fcdcc7953f68f13ed6770a.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/services/base.scm')
| -rw-r--r-- | gnu/services/base.scm | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 5298a11f63..dad1911d31 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -274,7 +274,8 @@ FILE-SYSTEM." (options (file-system-options file-system)) (check? (file-system-check? 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) (with-imported-modules '((gnu build file-systems) (guix build bournish)) @@ -284,7 +285,7 @@ FILE-SYSTEM." ,@(map dependency->shepherd-service-name dependencies))) (documentation "Check, mount, and unmount the given file system.") (start #~(lambda args - #$(if create? + #$(if create? #~(mkdir-p #$target) #t) @@ -292,11 +293,12 @@ FILE-SYSTEM." ;; Make sure fsck.ext2 & co. can be found. (dynamic-wind (lambda () - (setenv "PATH" - (string-append - #$e2fsprogs "/sbin:" - "/run/current-system/profile/sbin:" - $PATH))) + ;; Don’t display the PATH settings. + (with-output-to-port (%make-void-port "w") + (lambda () + (set-path-environment-variable "PATH" + '("bin" "sbin") + '#$packages)))) (lambda () (mount-file-system `(#$device #$title #$target #$type #$flags |