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

bug-fix for size output

Browse Source 
Signed-off-by: Wolfgang Link <w.link@proxmox.com>
This commit is contained in:
Wolfgang Link
2015-02-12 11:38:17 +01:00
committed by Dietmar Maurer
parent 76fd7dc7c2
commit 8a55ff7d39
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
PVE/Storage/ZFSPoolPlugin.pm
View File

@ -94,6 +94,8 @@ sub zfs_parse_zvol_list {
foreach my $line (@lines) { foreach my $line (@lines) {
if ($line =~ /^(.+)\s+([a-zA-Z0-9\.]+|\-)\s+(.+)$/) { if ($line =~ /^(.+)\s+([a-zA-Z0-9\.]+|\-)\s+(.+)$/) {
my $zvol = {}; my $zvol = {};
my $size = $2;
my $origin = $3;
my @parts = split /\//, $1; my @parts = split /\//, $1;
my $name = pop @parts; my $name = pop @parts;
my $pool = join('/', @parts); my $pool = join('/', @parts);
@ -103,9 +105,9 @@ sub zfs_parse_zvol_list {
$zvol->{pool} = $pool; $zvol->{pool} = $pool;
$zvol->{name} = $name; $zvol->{name} = $name;
$zvol->{size} = zfs_parse_size($2); $zvol->{size} = zfs_parse_size($size);
if ($3 !~ /^-$/) { if ($3 !~ /^-$/) {
$zvol->{origin} = $3; $zvol->{origin} = $origin;
} }
push @$list, $zvol; push @$list, $zvol;
} }