yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

no longer require controlmaster for interactive ssh

Browse Source 
we only run one ssh command, so control master is not needed
This commit is contained in:
Jörg Thalheim
2025-05-27 15:38:28 +02:00
parent 7b8b23b39b
commit f3cdcef523
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/clan-cli/clan_cli/ssh/deploy_info.py
View File

@@ -88,8 +88,7 @@ def ssh_shell_from_deploy(
deploy_info: DeployInfo, runtime: AsyncRuntime, host_key_check: HostKeyCheck deploy_info: DeployInfo, runtime: AsyncRuntime, host_key_check: HostKeyCheck
) -> None: ) -> None:
if host := find_reachable_host(deploy_info, host_key_check): if host := find_reachable_host(deploy_info, host_key_check):
with host.ssh_control_master() as ssh: host.interactive_ssh()
ssh.interactive_ssh()
else: else:
log.info("Could not reach host via clearnet 'addrs'") log.info("Could not reach host via clearnet 'addrs'")
log.info(f"Trying to reach host via tor '{deploy_info.tor}'") log.info(f"Trying to reach host via tor '{deploy_info.tor}'")

2
pkgs/clan-cli/clan_lib/ssh/remote.py
View File

@@ -324,7 +324,7 @@ class Remote:
return nix_shell(packages, cmd) return nix_shell(packages, cmd)
def interactive_ssh(self) -> None: 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) subprocess.run(cmd_list)