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

allow subvolume selection in ZPool storage

Browse Source
This commit is contained in:
Wolfgang Bumiller
2015-08-27 14:53:12 +02:00
committed by Dietmar Maurer
parent e67069eb58
commit 3932390b11
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
PVE/Storage.pm
View File

@ -986,17 +986,17 @@ sub scan_nfs {
sub scan_zfs { sub scan_zfs {
my $cmd = ['zpool', 'list', '-H', '-o', 'name,size,free']; my $cmd = ['zfs', 'list', '-t', 'filesystem', '-H', '-o', 'name,avail,used'];
my $res = []; my $res = [];
run_command($cmd, outfunc => sub { run_command($cmd, outfunc => sub {
my $line = shift; my $line = shift;
if ($line =~m/^(\S+)\s+(\S+)\s+(\S+)$/) { if ($line =~m/^(\S+)\s+(\S+)\s+(\S+)$/) {
my ($pool, $size_str, $free_str) = ($1, $2, $3); my ($pool, $size_str, $used_str) = ($1, $2, $3);
my $size = PVE::Storage::ZFSPoolPlugin::zfs_parse_size($size_str); my $size = PVE::Storage::ZFSPoolPlugin::zfs_parse_size($size_str);
my $free = PVE::Storage::ZFSPoolPlugin::zfs_parse_size($free_str); my $used = PVE::Storage::ZFSPoolPlugin::zfs_parse_size($used_str);
push @$res, { pool => $pool, size => $size, free => $free }; push @$res, { pool => $pool, size => $size, free => $size-$used };
} }
}); });