no longer require controlmaster for interactive ssh
we only run one ssh command, so control master is not needed
This commit is contained in:
@@ -88,8 +88,7 @@ def ssh_shell_from_deploy(
|
||||
deploy_info: DeployInfo, runtime: AsyncRuntime, host_key_check: HostKeyCheck
|
||||
) -> None:
|
||||
if host := find_reachable_host(deploy_info, host_key_check):
|
||||
with host.ssh_control_master() as ssh:
|
||||
ssh.interactive_ssh()
|
||||
host.interactive_ssh()
|
||||
else:
|
||||
log.info("Could not reach host via clearnet 'addrs'")
|
||||
log.info(f"Trying to reach host via tor '{deploy_info.tor}'")
|
||||
|
||||
@@ -324,7 +324,7 @@ class Remote:
|
||||
return nix_shell(packages, cmd)
|
||||
|
||||
def interactive_ssh(self) -> None:
|
||||
cmd_list = self.ssh_cmd(tty=True)
|
||||
cmd_list = self.ssh_cmd(tty=True, control_master=False)
|
||||
subprocess.run(cmd_list)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user