Commit 7f78e456 authored by intrigeri's avatar intrigeri
Browse files

Merge remote-tracking branch...

Merge remote-tracking branch 'origin/bugfix/17623-allow-connecting-via-virt-viewer' into stable (Closes: #17623)
parents 8509a769 25c45e35
......@@ -17,7 +17,7 @@ class Display
def start
@virtviewer = IO.popen(["virt-viewer", "--direct",
"--kiosk",
"--reconnect",
"--kiosk-quit=on-disconnect",
"--connect", "qemu:///system",
"--display", @x_display,
@domain,
......@@ -46,6 +46,9 @@ class Display
end
def screenshot(target)
# Restart the virt-viewer connection if it's not active anymore
# (for example because the user connected via virt-viewer themselves)
restart if not active?
FileUtils.rm_f(target)
popen_wait(['import', '-quality', '100%', '-window', 'root', target])
assert($?.success?)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment