cloudinit: use detected format in volname parsing

[qemu-server.git] / PVE / QemuServer / Cloudinit.pm

diff --git a/PVE/QemuServer/Cloudinit.pm b/PVE/QemuServer/Cloudinit.pm
index 981e6afd2fd563e7ddfd17cac2407cde19cafd7b..f46f7fdec65271fcc141dcb08c41545075223dc9 100644 (file)
--- a/PVE/QemuServer/Cloudinit.pm
+++ b/PVE/QemuServer/Cloudinit.pm
@@ -34,10 +34,11 @@ sub commit_cloudinit_disk {
 
     my $size = eval { PVE::Storage::file_size_info($iso_path) };
     if ($size <= 0) {
-       $volname =~ m/(vm-$vmid-cloudinit(.(qcow2|raw))?)/;
+       $volname =~ m/(vm-$vmid-cloudinit(.\Q$format\E)?)/;
        my $name = $1;
-       my $d = PVE::Storage::vdisk_alloc($storecfg, $storeid, $vmid, $format, $name, 4 * 1024);
-       $size = PVE::Storage::file_size_info($iso_path);
+       $size = 4 * 1024;
+       PVE::Storage::vdisk_alloc($storecfg, $storeid, $vmid, $format, $name, $size);
+       $size *= 1024; # vdisk alloc takes KB, qemu-img dd's osize takes byte
     }
 
     my $plugin = PVE::Storage::Plugin->lookup($scfg->{type});