]> git.proxmox.com Git - pve-storage.git/commitdiff
weaken matching for vzdump config extract filename
authorFabian Grünbichler <f.gruenbichler@proxmox.com>
Fri, 20 Jan 2017 09:03:33 +0000 (10:03 +0100)
committerWolfgang Bumiller <w.bumiller@proxmox.com>
Fri, 20 Jan 2017 10:13:58 +0000 (11:13 +0100)
to allow "pvesm extractconfig filename" when in the dump
directory.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
PVE/Storage.pm

index bfc34d40f6f36095e9a58577986623889a659484..b9ea42ae9716de87ec303540c4f862a942ce5763 100755 (executable)
@@ -1413,9 +1413,9 @@ sub extract_vzdump_config {
 
     my $archive = abs_filesystem_path($cfg, $volid);
 
-    if ($volid =~ /\/vzdump-(lxc|openvz)-\d+-(\d{4})_(\d{2})_(\d{2})-(\d{2})_(\d{2})_(\d{2})\.(tgz|(tar(\.(gz|lzo))?))$/) {
+    if ($volid =~ /vzdump-(lxc|openvz)-\d+-(\d{4})_(\d{2})_(\d{2})-(\d{2})_(\d{2})_(\d{2})\.(tgz|(tar(\.(gz|lzo))?))$/) {
        return extract_vzdump_config_tar($archive,'^(\./etc/vzdump/(pct|vps)\.conf)$');
-    } elsif ($volid =~ /\/vzdump-qemu-\d+-(\d{4})_(\d{2})_(\d{2})-(\d{2})_(\d{2})_(\d{2})\.(tgz|((tar|vma)(\.(gz|lzo))?))$/) {
+    } elsif ($volid =~ /vzdump-qemu-\d+-(\d{4})_(\d{2})_(\d{2})-(\d{2})_(\d{2})_(\d{2})\.(tgz|((tar|vma)(\.(gz|lzo))?))$/) {
        my $format;
        my $comp;
        if ($7 eq 'tgz') {