clone image: specify base format option with qemu-img

[pve-storage.git] / PVE / Storage / Plugin.pm

diff --git a/PVE/Storage/Plugin.pm b/PVE/Storage/Plugin.pm
index 07eb88f0145f963cacc4306293844c6e28f4b945..4a10a1fef93ceec3e9409a157bd2a9351cf95d53 100644 (file)
--- a/PVE/Storage/Plugin.pm
+++ b/PVE/Storage/Plugin.pm
@@ -708,7 +708,7 @@ sub clone_image {
        local $CWD = $imagedir;
 
        my $cmd = ['/usr/bin/qemu-img', 'create', '-b', "../$basevmid/$basename",
-                  '-f', 'qcow2', $path];
+                  '-F', $format, '-f', 'qcow2', $path];
 
        run_command($cmd);
     };
@@ -1039,6 +1039,7 @@ my $get_subdir_files = sub {
            my $format = $2;
            $fn = $1;
 
+           # only match for VMID now, to avoid false positives (VMID in parent directory name)
            next if defined($vmid) && $fn !~ m/\S+-$vmid-\S+/;
 
            $info = { volid => "$sid:backup/$fn", format => $format };
@@ -1248,8 +1249,9 @@ sub prune_backups {
        $prune_entry->{vmid} = $backup_vmid if defined($backup_vmid);
 
        if ($archive_info->{is_std_name}) {
-           die "internal error - got no vmid\n" if !defined($backup_vmid);
-           die "internal error - got wrong vmid\n" if defined($vmid) && $backup_vmid ne $vmid;
+           die "internal error - got no VMID\n" if !defined($backup_vmid);
+           die "internal error - got wrong VMID '$backup_vmid' != '$vmid'\n"
+               if defined($vmid) && $backup_vmid ne $vmid;
 
            $prune_entry->{ctime} = $archive_info->{ctime};
            my $group = "$backup_type/$backup_vmid";