diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-12-09 18:11:14 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-12-09 18:11:14 +0100 |
| commit | f80b4d2ce09b0b7770cbdf2f90704d41b0a168c5 (patch) | |
| tree | ec47c7ee5d5579cfa00f13b5038ff3d8c87e4a48 /gnu/services/base.scm | |
| parent | 13b5f44b475aa385d580f7e19b907210bc1d6d99 (diff) | |
| parent | 2608e40988ba8cf51723fe0d21bdedf6b3997c9c (diff) | |
| download | patches-f80b4d2ce09b0b7770cbdf2f90704d41b0a168c5.tar patches-f80b4d2ce09b0b7770cbdf2f90704d41b0a168c5.tar.gz | |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'gnu/services/base.scm')
| -rw-r--r-- | gnu/services/base.scm | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 2b3d3f8548..ea1ab63d1b 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -269,10 +269,24 @@ FILE-SYSTEM." #$(if create? #~(mkdir-p #$target) #t) - (mount-file-system - `(#$device #$title #$target #$type #$flags #$options - #$check?) #:root "/") - #t)) + + (let (($PATH (getenv "PATH"))) + ;; Make sure fsck.ext2 & co. can be found. + (dynamic-wind + (lambda () + (setenv "PATH" + (string-append + #$e2fsprogs "/sbin:" + "/run/current-system/profile/sbin:" + $PATH))) + (lambda () + (mount-file-system + `(#$device #$title #$target #$type #$flags + #$options #$check?) + #:root "/")) + (lambda () + (setenv "PATH" $PATH))) + #t))) (stop #~(lambda args ;; Normally there are no processes left at this point, so ;; TARGET can be safely unmounted. |