yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zfs: reformat code with perltidy

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht
2025-07-17 19:47:38 +02:00
parent a81ee83127
commit 61aaf78786
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/PVE/Storage/ZFSPlugin.pm
View File

@ -247,26 +247,26 @@ sub on_add_hook {
$base_path = PVE::Storage::LunCmd::Istgt::get_base($scfg); $base_path = PVE::Storage::LunCmd::Istgt::get_base($scfg);
} elsif ($scfg->{iscsiprovider} eq 'iet' || $scfg->{iscsiprovider} eq 'LIO') { } elsif ($scfg->{iscsiprovider} eq 'iet' || $scfg->{iscsiprovider} eq 'LIO') {
# Provider implementations hard-code '/dev/', which does not work for distributions like # Provider implementations hard-code '/dev/', which does not work for distributions like
# Debian 12. Keep that implementation as-is for backwards compatibility, but use custom # Debian 12. Keep that implementation as-is for backwards compatibility, but use custom
# logic here. # logic here.
my $target = 'root@' . $scfg->{portal}; my $target = 'root@' . $scfg->{portal};
my $cmd = [@ssh_cmd, '-i', "$id_rsa_path/$scfg->{portal}_id_rsa", $target]; my $cmd = [@ssh_cmd, '-i', "$id_rsa_path/$scfg->{portal}_id_rsa", $target];
push $cmd->@*, 'ls', '/dev/zvol'; push $cmd->@*, 'ls', '/dev/zvol';
my $rc = eval { run_command($cmd, timeout => 10, noerr => 1, quiet => 1) }; my $rc = eval { run_command($cmd, timeout => 10, noerr => 1, quiet => 1) };
my $err = $@; my $err = $@;
if (defined($rc) && $rc == 0) { if (defined($rc) && $rc == 0) {
$base_path = '/dev/zvol'; $base_path = '/dev/zvol';
} elsif (defined($rc) && $rc == ENOENT) { } elsif (defined($rc) && $rc == ENOENT) {
$base_path = '/dev'; $base_path = '/dev';
} else { } else {
my $message = $err ? $err : "remote command failed"; my $message = $err ? $err : "remote command failed";
chomp($message); chomp($message);
$message .= " ($rc)" if defined($rc); $message .= " ($rc)" if defined($rc);
$message .= " - check 'zfs-base-path' setting manually!"; $message .= " - check 'zfs-base-path' setting manually!";
log_warn($message); log_warn($message);
$base_path = '/dev/zvol'; $base_path = '/dev/zvol';
} }
} else { } else {
$zfs_unknown_scsi_provider->($scfg->{iscsiprovider}); $zfs_unknown_scsi_provider->($scfg->{iscsiprovider});
} }