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 2C66760868 for ; Sat, 6 Feb 2021 14:40:37 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1874F117DB for ; Sat, 6 Feb 2021 14:40:07 +0100 (CET) Received: from kvmformation1.odiso.net (globalOdiso.M6Lille.odiso.net [89.248.211.242]) by firstgate.proxmox.com (Proxmox) with ESMTP id E8734117D3 for ; Sat, 6 Feb 2021 14:40:02 +0100 (CET) Received: by kvmformation1.odiso.net (Postfix, from userid 0) id 4BD6546FF1; Sat, 6 Feb 2021 14:40:02 +0100 (CET) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Sat, 6 Feb 2021 14:39:54 +0100 Message-Id: <20210206133954.2406921-1-aderumier@odiso.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -0.192 Adjusted score from AWL reputation of From: address HEADER_FROM_DIFFERENT_DOMAINS 0.25 From and EnvelopeFrom 2nd level mail domains are different 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 KHOP_HELO_FCRDNS 0.4 Relay HELO differs from its IP's reverse DNS NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records 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 Subject: [pve-devel] [PATCH qemu-server] cloudinit: remove pending delete on online regenerate image 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: Sat, 06 Feb 2021 13:40:37 -0000 currently only pending changes are applied when we regenerate image on a running vm, but not the pending delete. Signed-off-by: Alexandre Derumier --- PVE/QemuServer.pm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 4d4efd9..f401baf 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -4462,6 +4462,13 @@ sub vmconfig_hotplug_pending { $conf->{$opt} = delete $conf->{pending}->{$opt}; } + my $pending_delete_hash = PVE::QemuConfig->parse_pending_delete($conf->{pending}->{delete}); + foreach my $opt (sort keys %$pending_delete_hash) { + next if !grep { $_ eq $opt } @cloudinit_opts; + PVE::QemuConfig->remove_from_pending_delete($conf, $opt); + delete $conf->{$opt}; + } + my $new_conf = { %$conf }; $new_conf->{$key} = $value; PVE::QemuServer::Cloudinit::generate_cloudinitconfig($new_conf, $vmid); -- 2.20.1