From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Tue, 30 Apr 2019 13:24:53 +0000 (+0000)
Subject: cloudinit: use detected format in volname parsing
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=92fcaab73a591dd02de001087cc8652af4a06a77;p=qemu-server.git

cloudinit: use detected format in volname parsing

keep the ?, as format is raw if no file ending is there, which we
want to handle too.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---

diff --git a/PVE/QemuServer/Cloudinit.pm b/PVE/QemuServer/Cloudinit.pm
index 6b99b46..f46f7fd 100644
--- a/PVE/QemuServer/Cloudinit.pm
+++ b/PVE/QemuServer/Cloudinit.pm
@@ -34,7 +34,7 @@ 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;
 	$size = 4 * 1024;
 	PVE::Storage::vdisk_alloc($storecfg, $storeid, $vmid, $format, $name, $size);