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

parse_volname: always return image format

Browse Source
This commit is contained in:
Dietmar Maurer
2015-08-12 07:01:07 +02:00
parent 55525ad265
commit 7800e84d28
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PVE/Storage/DRBDPlugin.pm
View File

@ -133,7 +133,7 @@ sub parse_volname {
my ($class, $volname) = @_;
if ($volname =~ m/^(vm-(\d+)-[a-z][a-z0-9\-\_\.]*[a-z0-9]+)$/) {
return ('images', $1, $2);
return ('images', $1, $2, undef, undef, undef, 'raw');
}
die "unable to parse lvm volume name '$volname'\n";

2
PVE/Storage/ISCSIDirectPlugin.pm
View File

@ -77,7 +77,7 @@ sub parse_volname {
if ($volname =~ m/^lun(\d+)$/) {
return ('images', $1, undef);
return ('images', $1, undef, undef, undef, undef, 'raw');
}
die "unable to parse iscsi volume name '$volname'\n";

2
PVE/Storage/ISCSIPlugin.pm
View File

@ -271,7 +271,7 @@ sub parse_volname {
my ($class, $volname) = @_;
if ($volname =~ m!^\d+\.\d+\.\d+\.(\S+)$!) {
return ('images', $1, undef);
return ('images', $1, undef, undef, undef, undef, 'raw');
}
die "unable to parse iscsi volume name '$volname'\n";

2
PVE/Storage/LVMPlugin.pm
View File

@ -221,7 +221,7 @@ sub parse_volname {
parse_lvm_name($volname);
if ($volname =~ m/^(vm-(\d+)-\S+)$/) {
return ('images', $1, $2);
return ('images', $1, $2, undef, undef, undef, 'raw');
}
die "unable to parse lvm volume name '$volname'\n";

2
PVE/Storage/RBDPlugin.pm
View File

@ -244,7 +244,7 @@ sub parse_volname {
my ($class, $volname) = @_;
if ($volname =~ m/^((base-(\d+)-\S+)\/)?((base)?(vm)?-(\d+)-\S+)$/) {
return ('images', $4, $7, $2, $3, $5);
return ('images', $4, $7, $2, $3, $5, 'raw');
}
die "unable to parse rbd volume name '$volname'\n";

2
PVE/Storage/SheepdogPlugin.pm
View File

@ -124,7 +124,7 @@ sub parse_volname {
my ($class, $volname) = @_;
if ($volname =~ m/^((base-(\d+)-\S+)\/)?((base)?(vm)?-(\d+)-\S+)$/) {
return ('images', $4, $7, $2, $3, $5);
return ('images', $4, $7, $2, $3, $5, 'raw');
}
die "unable to parse sheepdog volume name '$volname'\n";