From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id E689C6005F for ; Wed, 2 Dec 2020 13:50:28 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E492E1B7F0 for ; Wed, 2 Dec 2020 13:50:28 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 7C2681B7E8 for ; Wed, 2 Dec 2020 13:50:28 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 4451644441 for ; Wed, 2 Dec 2020 13:50:28 +0100 (CET) From: Mira Limbeck To: pve-devel@lists.proxmox.com Date: Wed, 2 Dec 2020 13:50:25 +0100 Message-Id: <20201202125025.27401-1-m.limbeck@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.233 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [qemuserver.pm] Subject: [pve-devel] [PATCH v2 qemu-server] fix cloning/restoring of cloudinit disks in raw format X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Dec 2020 12:50:28 -0000 We only added the format extension when it was not 'raw'. But on file level storages we always require it. To fix this, always add the format extension if the storage provides the 'path' property. This is the same logic we use in create_disks for cloudinit disks. Signed-off-by: Mira Limbeck --- v2: - added the same fix when restoring from backup PVE/QemuServer.pm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 4989938..412113e 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -5797,7 +5797,10 @@ my $restore_allocate_devices = sub { my $name; if ($d->{is_cloudinit}) { $name = "vm-$vmid-cloudinit"; - $name .= ".$d->{format}" if $d->{format} ne 'raw'; + my $scfg = PVE::Storage::storage_config($storecfg, $storeid); + if ($scfg->{path}) { + $name .= ".$d->{format}"; + } } my $volid = PVE::Storage::vdisk_alloc( @@ -6945,7 +6948,10 @@ sub clone_disk { my $size = undef; if (drive_is_cloudinit($drive)) { $name = "vm-$newvmid-cloudinit"; - $name .= ".$dst_format" if $dst_format ne 'raw'; + my $scfg = PVE::Storage::storage_config($storecfg, $storeid); + if ($scfg->{path}) { + $name .= ".$dst_format"; + } $snapname = undef; $size = PVE::QemuServer::Cloudinit::CLOUDINIT_DISK_SIZE; } elsif ($drivename eq 'efidisk0') { -- 2.20.1