[pve-devel] [PATCH storage 1/1] upload: use SSH helper to get ssh/scp options

[Fabian Grünbichler]

Signed-off-by: Fabian Grünbichler <f.gruenbich...@proxmox.com>
---
requires versioned dependency on libpve-cluster-perl with the new helper

 src/PVE/API2/Storage/Status.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/PVE/API2/Storage/Status.pm b/src/PVE/API2/Storage/Status.pm
index b2336e6..d6de7fb 100644
--- a/src/PVE/API2/Storage/Status.pm
+++ b/src/PVE/API2/Storage/Status.pm
@@ -466,9 +466,9 @@ __PACKAGE__->register_method ({
        if ($node ne 'localhost' && $node ne PVE::INotify::nodename()) {
            my $remip = PVE::Cluster::remote_node_ip($node);
 
-           my @ssh_options = ('-o', 'BatchMode=yes');
+           my $ssh_options = PVE::SSHInfo::ssh_info_to_ssh_opts({ ip => 
$remip, name => $node });
 
-           my @remcmd = ('/usr/bin/ssh', @ssh_options, $remip, '--');
+           my @remcmd = ('/usr/bin/ssh', $ssh_options->@*, $remip, '--');
 
            eval { # activate remote storage
                run_command([@remcmd, '/usr/sbin/pvesm', 'status', '--storage', 
$param->{storage}]);
@@ -480,7 +480,7 @@ __PACKAGE__->register_method ({
                errmsg => "mkdir failed",
            );
  
-           $cmd = ['/usr/bin/scp', @ssh_options, '-p', '--', $tmpfilename, 
"[$remip]:" . PVE::Tools::shell_quote($dest)];
+           $cmd = ['/usr/bin/scp', $ssh_options->@*, '-p', '--', $tmpfilename, 
"[$remip]:" . PVE::Tools::shell_quote($dest)];
 
            $err_cleanup = sub { run_command([@remcmd, 'rm', '-f', '--', 
$dest]) };
        } else {
-- 
2.39.2



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel