summary refs log tree commit diff
path: root/gnu/build
diff options
context:
space:
mode:
authorChris Marusich <cmmarusich@gmail.com>2018-07-30 22:47:43 -0700
committerChris Marusich <cmmarusich@gmail.com>2018-08-28 00:14:25 -0700
commit4dd53a83b5292d4e90ca221d6bcf03350ed8dc45 (patch)
tree8d05932457b6fdec565939b1f95ec5e0f3549554 /gnu/build
parentd973915e4842b8b1bfc2266ed42d3b8c2ca77e93 (diff)
downloadguix-4dd53a83b5292d4e90ca221d6bcf03350ed8dc45.tar.gz
marionette: Add support for QEMU's "quit" command.
* gnu/build/marionette.scm (marionette-control): Don't wait for the
monitor prompt when the command was "quit".
Diffstat (limited to 'gnu/build')
-rw-r--r--gnu/build/marionette.scm3
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/build/marionette.scm b/gnu/build/marionette.scm
index bb018fc9c1..61284b8980 100644
--- a/gnu/build/marionette.scm
+++ b/gnu/build/marionette.scm
@@ -222,7 +222,8 @@ pcsys_monitor\")."
     (($ <marionette> _ _ monitor)
      (display command monitor)
      (newline monitor)
-     (wait-for-monitor-prompt monitor))))
+     ;; The "quit" command terminates QEMU immediately, with no output.
+     (unless (string=? command "quit") (wait-for-monitor-prompt monitor)))))
 
 (define* (marionette-screen-text marionette
                                  #:key