[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#25917: [PATCH v2] services: file-system-shepherd-service: Make it fi
From: |
Danny Milosavljevic |
Subject: |
bug#25917: [PATCH v2] services: file-system-shepherd-service: Make it find the fsck programs. |
Date: |
Sat, 18 Mar 2017 15:06:32 +0100 |
* gnu/services/base.scm (file-system-shepherd-service): Use
file-system-packages.
---
gnu/services/base.scm | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 5298a11f6..ab5030146 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))
@@ -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
- bug#25917: [PATCH] services: Don't check filesystem even if #:check? if not #:needed-for-boot., (continued)
bug#25917: [PATCH v2] services: If a filesystem is not marked as needed for boot, don't check it even if told to check it., Danny Milosavljevic, 2017/03/12
bug#25917: [PATCH] file-systems: Factorize file-system-packages., Danny Milosavljevic, 2017/03/16
bug#25917: [PATCH v2] services: file-system-shepherd-service: Make it find the fsck programs.,
Danny Milosavljevic <=