public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Mira Limbeck <m.limbeck@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: Re: [pve-devel] [PATCH qemu-server] fix cloning of cloudinit disks in raw format on file level storages
Date: Wed, 2 Dec 2020 12:27:08 +0100	[thread overview]
Message-ID: <d0aa11a7-0e2e-7034-47f3-2a2da5adba29@proxmox.com> (raw)
In-Reply-To: <20201201145301.12838-1-m.limbeck@proxmox.com>

Only fixes the clone_disk case, not the restore from backup one. Will 
send a v2 with both fixes.

On 12/1/20 3:53 PM, Mira Limbeck wrote:
> 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 <m.limbeck@proxmox.com>
> ---
>   PVE/QemuServer.pm | 5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
> index 4989938..73dcb05 100644
> --- a/PVE/QemuServer.pm
> +++ b/PVE/QemuServer.pm
> @@ -6945,7 +6945,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') {




      reply	other threads:[~2020-12-02 11:27 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-01 14:53 Mira Limbeck
2020-12-02 11:27 ` Mira Limbeck [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=d0aa11a7-0e2e-7034-47f3-2a2da5adba29@proxmox.com \
    --to=m.limbeck@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal