gaschz/ansible-qubes
1
0
Fork 0
mirror of https://github.com/Rudd-O/ansible-qubes.git synced 2025-06-06 18:08:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Document and dedent certain code paths

Browse Source
This commit is contained in:
Manuel Amador (Rudd-O) 2015-12-07 09:52:46 +00:00
parent 1f8e70b891
commit 54f0bb44fa
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
bin/qssh
View File

@ -52,6 +52,7 @@ def get_vmname_and_management_proxy(hostname):
parms = sys.argv[1:] parms = sys.argv[1:]
host, rest = find_hostname_and_command(parms) host, rest = find_hostname_and_command(parms)
# SCP execution path.
if os.path.basename(sys.argv[0]) in ("scp", "qscp"): if os.path.basename(sys.argv[0]) in ("scp", "qscp"):
if not is_qubes_host(host): if not is_qubes_host(host):
os.execv("/usr/bin/scp", ["/usr/bin/scp"] + parms) os.execv("/usr/bin/scp", ["/usr/bin/scp"] + parms)
@ -60,17 +61,17 @@ if os.path.basename(sys.argv[0]) in ("scp", "qscp"):
scmd = ["/usr/bin/scp"] + ["-S", path_to_ssh] + parms scmd = ["/usr/bin/scp"] + ["-S", path_to_ssh] + parms
os.execvp(scmd[0], scmd) os.execvp(scmd[0], scmd)
else: # SSH execution path.
if not is_qubes_host(host): if not is_qubes_host(host):
os.execv("/usr/bin/ssh", ["/usr/bin/ssh"] + parms) os.execv("/usr/bin/ssh", ["/usr/bin/ssh"] + parms)
path_to_bombshell = os.path.abspath(os.path.join(os.path.dirname(__file__), "bombshell-client")) path_to_bombshell = os.path.abspath(os.path.join(os.path.dirname(__file__), "bombshell-client"))
vmname, proxy = get_vmname_and_management_proxy(host) vmname, proxy = get_vmname_and_management_proxy(host)
if proxy: if proxy:
assert 0, "While connecting to %s (VM name %s): management proxy not supported yet" % (host, vmname) assert 0, "While connecting to %s (VM name %s): management proxy not supported yet" % (host, vmname)
cmd = [ cmd = [
path_to_bombshell, path_to_bombshell,
vmname, vmname,
] + ["sh", "-c", " ".join(rest)] ] + ["sh", "-c", " ".join(rest)]
os.execvp(cmd[0], cmd) os.execvp(cmd[0], cmd)