diff options
Diffstat (limited to 'gnu/build')
| -rw-r--r-- | gnu/build/file-systems.scm | 15 | ||||
| -rw-r--r-- | gnu/build/vm.scm | 8 |
2 files changed, 13 insertions, 10 deletions
diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm index 3f97afeedd..e3369d8521 100644 --- a/gnu/build/file-systems.scm +++ b/gnu/build/file-systems.scm @@ -535,10 +535,19 @@ 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.~%") + + ;; 'current-output-port' is typically connected to /dev/klog (in + ;; PIDÂ 1), but here we want to make sure we talk directly to the + ;; user. + (with-output-to-file "/dev/console" + (lambda () + (start-repl %bournish-language)))))) (format (current-error-port) "No file system check procedure for ~a; skipping~%" device))) diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index 83ad489cc7..0aef73d26d 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -105,13 +105,7 @@ the #:references-graphs parameter of 'derivation'." ;; hardware virtualization to still use these commands. KVM support is ;; still buggy on some ARM32 boards. Do not use it even if available. ,@(if (and (file-exists? "/dev/kvm") - (not target-arm32?) - - ;; XXX: 32-bit 'qemu-system-i386 -enable-kvm' segfaults on - ;; x86_64 hosts running Linux-libre 4.17: - ;; <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=31380#18> and - ;; <https://lists.gnu.org/archive/html/qemu-devel/2018-07/msg01166.html>. - (not (string-suffix? "-i386" qemu))) + (not target-arm32?)) '("-enable-kvm") '()) |