diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2018-12-18 14:51:56 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-12-18 16:04:26 +0100 |
| commit | 6ea6e1476ff4a18d4b4b864c3065d18ed99c69af (patch) | |
| tree | 00cb5c5767ae74f8f6c5f22f4ba949206db81157 /gnu/build | |
| parent | 65c8a043709e9e13f814211bba98c57eb00d9620 (diff) | |
| download | gnu-guix-6ea6e1476ff4a18d4b4b864c3065d18ed99c69af.tar gnu-guix-6ea6e1476ff4a18d4b4b864c3065d18ed99c69af.tar.gz | |
file-systems: Spawn a REPL only when interaction is possible.
Fixes <https://bugs.gnu.org/23697>.
Reported by Jan Nieuwenhuizen <janneke@gnu.org>.
* gnu/build/file-systems.scm (check-file-system): Call 'start-repl' only
if current-input-port passes 'isatty?'.
* gnu/services/shepherd.scm (shepherd-configuration-file): After
'for-each' expression, call 'redirect-port'.
* gnu/tests/base.scm (run-basic-test)["stdin is /dev/null"]: New test.
Diffstat (limited to 'gnu/build')
| -rw-r--r-- | gnu/build/file-systems.scm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm index 3f97afeedd..efd744acc1 100644 --- a/gnu/build/file-systems.scm +++ b/gnu/build/file-systems.scm @@ -535,10 +535,13 @@ were found." (sleep 3) (reboot)) ('fatal-error - (format (current-error-port) - "File system check on ~a failed; spawning Bourne-like REPL~%" + (format (current-error-port) "File system check on ~a failed~%" device) - (start-repl %bournish-language))) + + ;; Spawn a REPL only if someone would be able to interact with it. + (when (isatty? (current-input-port)) + (format (current-error-port) "Spawning Bourne-like REPL.~%") + (start-repl %bournish-language)))) (format (current-error-port) "No file system check procedure for ~a; skipping~%" device))) |