diff --git a/action_plugins/commonlib.py b/action_plugins/commonlib.py index df4506e..ef7963d 100644 --- a/action_plugins/commonlib.py +++ b/action_plugins/commonlib.py @@ -96,6 +96,8 @@ def inject_qubes(inject): pass elif vmtype == "ProxyVM": add(flags, "proxy") + elif vmtype == "DispVM": + pass elif vmtype == "TemplateVM": try: qubes["source"] = qubes["template"] diff --git a/action_plugins/qubesformation.py b/action_plugins/qubesformation.py index b6369cd..d975592 100644 --- a/action_plugins/qubesformation.py +++ b/action_plugins/qubesformation.py @@ -99,7 +99,7 @@ class ActionModule(template): qubesdata = commonlib.inject_qubes(task_vars) task_vars["vms"] = generate_datastructure(qubesdata, task_vars) with tempfile.NamedTemporaryFile() as x: - x.write(contents) + x.write(contents.encode()) x.flush() self._task.args['src'] = x.name retval = template.run(self, tmp, task_vars) @@ -107,7 +107,7 @@ class ActionModule(template): return retval with tempfile.NamedTemporaryFile() as y: - y.write(topcontents) + y.write(topcontents.encode()) y.flush() # Create new tmp path -- the other was blown away. diff --git a/bin/bombshell-client b/bin/bombshell-client index 73ea314..940dcfd 100755 --- a/bin/bombshell-client +++ b/bin/bombshell-client @@ -352,7 +352,7 @@ def main_master(): assert remote_command def anypython(exe): - return "` test -x %s && echo %s || echo python`" % ( + return "` test -x %s && echo %s || echo python3`" % ( quote(exe), quote(exe), ) diff --git a/connection_plugins/qubes.py b/connection_plugins/qubes.py index 85f7380..5dbbde6 100644 --- a/connection_plugins/qubes.py +++ b/connection_plugins/qubes.py @@ -313,7 +313,7 @@ class Connection(ConnectionBase): if not self._connected: remote_cmd = [to_bytes(x, errors='surrogate_or_strict') for x in [ # 'strace', '-s', '2048', '-o', '/tmp/log', - 'python', '-u', '-i', '-c', preamble + 'python3', '-u', '-i', '-c', preamble ]] addr = self._play_context.remote_addr proxy = to_bytes(self.get_option("management_proxy")) if self.get_option("management_proxy") else ""