diff options
| author | David McFarland <corngood@gmail.com> | 2023-06-12 23:45:53 -0300 |
|---|---|---|
| committer | David McFarland <corngood@gmail.com> | 2023-06-13 00:55:34 -0300 |
| commit | d5e1eb20a2712eb17076c3ca2d30e5ac4a351d00 (patch) | |
| tree | 752b25314f163a73c6f33eed46a054e07bc4e399 /src | |
| parent | 5454fdcceb2004c67b0c829ae1ee447da9c81d00 (diff) | |
Pass common ssh options in isMasterRunning
Diffstat (limited to 'src')
| -rw-r--r-- | src/libstore/ssh.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/libstore/ssh.cc b/src/libstore/ssh.cc index fae99d75b..da32f1b79 100644 --- a/src/libstore/ssh.cc +++ b/src/libstore/ssh.cc @@ -42,7 +42,10 @@ void SSHMaster::addCommonSSHOpts(Strings & args) } bool SSHMaster::isMasterRunning() { - auto res = runProgram(RunOptions {.program = "ssh", .args = {"-O", "check", host}, .mergeStderrToStdout = true}); + Strings args = {"-O", "check", host}; + addCommonSSHOpts(args); + + auto res = runProgram(RunOptions {.program = "ssh", .args = args, .mergeStderrToStdout = true}); return res.first == 0; } |