ssh remote: Restore ControlPersist=no (#19277)

This restores the change from #19193 that I erroneously reverted in
#19234.

I think the bug in #19275 got in my way when testing.

With that bug fixed, the changes in here also work fine.


Release Notes:

- N/A
This commit is contained in:
Thorsten Ball 2024-10-16 16:13:31 +02:00 committed by GitHub
parent 7d2628e805
commit 9d944d0662
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -1186,7 +1186,14 @@ impl SshRemoteConnection {
.stderr(Stdio::piped())
.env("SSH_ASKPASS_REQUIRE", "force")
.env("SSH_ASKPASS", &askpass_script_path)
.args(["-N", "-o", "ControlMaster=yes", "-o"])
.args([
"-N",
"-o",
"ControlPersist=no",
"-o",
"ControlMaster=yes",
"-o",
])
.arg(format!("ControlPath={}", socket_path.display()))
.arg(&url)
.spawn()?;