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

zfs_parse_zvol_list: simplify regex

Browse Source
This commit is contained in:
Dietmar Maurer
2016-04-04 08:51:13 +02:00
parent b3bb525e45
commit 8e5b96cac3
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
PVE/Storage/ZFSPoolPlugin.pm
View File

@ -129,9 +129,10 @@ sub zfs_parse_zvol_list {
sub parse_volname { sub parse_volname {
my ($class, $volname) = @_; my ($class, $volname) = @_;
if ($volname =~ m/^(((base|vm|basevol)-(\d+)-\S+)\/)?((base|basevol)?(vm|subvol)?-(\d+)-\S+)$/) { if ($volname =~ m/^(((base|basevol)-(\d+)-\S+)\/)?((base|basevol|vm|subvol)-(\d+)-\S+)$/) {
my $format = ($7 && $7 eq 'subvol') || ( $6 && $6 eq 'basevol') ? 'subvol' : 'raw'; my $format = ($6 eq 'subvol' || $6 eq 'basevol') ? 'subvol' : 'raw';
return ('images', $5, $8, $2, $4, $6, $format); my $isBase = ($6 eq 'base' || $6 eq 'basevol');
return ('images', $5, $7, $2, $4, $isBase, $format);
} }
die "unable to parse zfs volume name '$volname'\n"; die "unable to parse zfs volume name '$volname'\n";