Merge 2.1 into 2.2 branch.

This commit is contained in:
grossmj committed 2018-12-21 15:24:34 +08:00
commit 468145319d
3 files changed
+12 -2

No files matched your search

+1 -1
View File
@@ -558,7 +558,7 @@ class DockerVM(BaseNode):
with open(os.path.join(self.working_dir, "vnc.log"), "w") as fd:
self._vnc_process = await asyncio.create_subprocess_exec("x11vnc",
"-forever",
"-nopw"
"-nopw",
"-shared",
"-geometry", self._console_resolution,
"-display", "WAIT:{}".format(self._display),