Skip to content
Snippets Groups Projects
Commit d4522ee3 authored by Andrea Bolognani's avatar Andrea Bolognani
Browse files

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.
parent 2b2d94fb
No related branches found
No related tags found
1 merge request!72Prepare 6.8.0 1
From: Andrea Bolognani <abologna@redhat.com>
Date: Tue, 27 Oct 2020 00:15:33 +0100
Subject: rpc: Fix virt-ssh-helper detection
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
When trying to figure out whether virt-ssh-helper is available
on the remote host, we mistakenly look for the helper by the
name it had while the feature was being worked on instead of
the one that was ultimately picked, and thus end up using the
netcat fallback every single time.
Fixes: f8ec7c842df9e40c6607eae9b0223766cb226336
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
(cherry picked from commit 7d959c302d10e97390b171334b885887de427a32)
---
src/rpc/virnetclient.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
index 8c7c7a0..d430f32 100644
--- a/src/rpc/virnetclient.c
+++ b/src/rpc/virnetclient.c
@@ -453,7 +453,7 @@ virNetClientSSHHelperCommand(virNetClientProxy proxy,
switch (proxy) {
case VIR_NET_CLIENT_PROXY_AUTO:
- return g_strdup_printf("sh -c 'which virt-nc 1>/dev/null 2>&1; "
+ return g_strdup_printf("sh -c 'which virt-ssh-helper 1>/dev/null 2>&1; "
"if test $? = 0; then "
" %s; "
"else"
backport/rpc-Fix-virt-ssh-helper-detection.patch
forward/Skip-vircgrouptest.patch
forward/Reduce-udevadm-settle-timeout-to-10-seconds.patch
forward/Pass-GPG_TTY-env-var-to-the-ssh-binary.patch
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment