From mboxrd@z Thu Jan 1 00:00:00 1970 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 Message-ID: <20170318140632.1778-1-dannym@scratchpost.org> References: <20170316174029.1663-1-dannym@scratchpost.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:49512) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cpF0b-00082f-Oo for bug-guix@gnu.org; Sat, 18 Mar 2017 10:07:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cpF0Y-0001Zr-K2 for bug-guix@gnu.org; Sat, 18 Mar 2017 10:07:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:35815) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cpF0Y-0001Zn-GQ for bug-guix@gnu.org; Sat, 18 Mar 2017 10:07:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cpF0Y-0005im-A0 for bug-guix@gnu.org; Sat, 18 Mar 2017 10:07:02 -0400 Sender: "Debbugs-submit" Resent-Message-ID: In-Reply-To: <20170316174029.1663-1-dannym@scratchpost.org> List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: 25917@debbugs.gnu.org, ludo@gnu.org * 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