diff --git a/pkgs/clan-cli/clan_cli/ssh/deploy_info.py b/pkgs/clan-cli/clan_cli/ssh/deploy_info.py index 0f6178668..580d59797 100644 --- a/pkgs/clan-cli/clan_cli/ssh/deploy_info.py +++ b/pkgs/clan-cli/clan_cli/ssh/deploy_info.py @@ -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}'") diff --git a/pkgs/clan-cli/clan_lib/ssh/remote.py b/pkgs/clan-cli/clan_lib/ssh/remote.py index 51d8dcd93..331ff85a6 100644 --- a/pkgs/clan-cli/clan_lib/ssh/remote.py +++ b/pkgs/clan-cli/clan_lib/ssh/remote.py @@ -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)