patches: Add backport/rpc-Fix-virt-ssh-helper-detection.patch
Backport a fix for the virt-ssh-helper feature from the upcoming
6.9.0 release.
Andrea Bolognani
3 years ago
| 0 | From: Andrea Bolognani <abologna@redhat.com> | |
| 1 | Date: Tue, 27 Oct 2020 00:15:33 +0100 | |
| 2 | Subject: rpc: Fix virt-ssh-helper detection | |
| 3 | MIME-Version: 1.0 | |
| 4 | Content-Type: text/plain; charset="utf-8" | |
| 5 | Content-Transfer-Encoding: 8bit | |
| 6 | ||
| 7 | When trying to figure out whether virt-ssh-helper is available | |
| 8 | on the remote host, we mistakenly look for the helper by the | |
| 9 | name it had while the feature was being worked on instead of | |
| 10 | the one that was ultimately picked, and thus end up using the | |
| 11 | netcat fallback every single time. | |
| 12 | ||
| 13 | Fixes: f8ec7c842df9e40c6607eae9b0223766cb226336 | |
| 14 | Signed-off-by: Andrea Bolognani <abologna@redhat.com> | |
| 15 | Reviewed-by: Neal Gompa <ngompa13@gmail.com> | |
| 16 | Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> | |
| 17 | (cherry picked from commit 7d959c302d10e97390b171334b885887de427a32) | |
| 18 | --- | |
| 19 | src/rpc/virnetclient.c | 2 +- | |
| 20 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
| 21 | ||
| 22 | diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c | |
| 23 | index 8c7c7a0..d430f32 100644 | |
| 24 | --- a/src/rpc/virnetclient.c | |
| 25 | +++ b/src/rpc/virnetclient.c | |
| 26 | @@ -453,7 +453,7 @@ virNetClientSSHHelperCommand(virNetClientProxy proxy, | |
| 27 | ||
| 28 | switch (proxy) { | |
| 29 | case VIR_NET_CLIENT_PROXY_AUTO: | |
| 30 | - return g_strdup_printf("sh -c 'which virt-nc 1>/dev/null 2>&1; " | |
| 31 | + return g_strdup_printf("sh -c 'which virt-ssh-helper 1>/dev/null 2>&1; " | |
| 32 | "if test $? = 0; then " | |
| 33 | " %s; " | |
| 34 | "else" |