Merge remote-tracking branch 'origin/2.1' into 2.1

pull/1487/head
grossmj 6 years ago
commit 670b6d689a

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

Loading…
Cancel
Save