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 08FE18DE7 for ; Wed, 16 Nov 2022 18:14:41 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DEB5923291 for ; Wed, 16 Nov 2022 18:14:10 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 for ; Wed, 16 Nov 2022 18:14:09 +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 288E544D73; Wed, 16 Nov 2022 18:14:09 +0100 (CET) From: Wolfgang Bumiller To: pve-devel@lists.proxmox.com Date: Wed, 16 Nov 2022 18:14:04 +0100 Message-Id: <20221116171408.216775-3-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221116171408.216775-1-w.bumiller@proxmox.com> References: <20221116171408.216775-1-w.bumiller@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: =?UTF-8?Q?0=0A=09?=AWL 0.233 Adjusted score from AWL reputation of From: =?UTF-8?Q?address=0A=09?=BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict =?UTF-8?Q?Alignment=0A=09?=SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF =?UTF-8?Q?Record=0A=09?=SPF_PASS -0.001 SPF: sender matches SPF =?UTF-8?Q?record=0A=09?=URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [cloudinit.pm] Subject: [pve-devel] [PATCH qemu-server 2/6] Partially-revert "cloudinit: add cloudinit section for current generated config" 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, 16 Nov 2022 17:14:41 -0000 This partially reverts commit 95a5135dad974c7eae249cf92b62b06fe911af33. Particularly the unprotected write to the config when generating the cloudinit file. We leave the rest as is for now and update the callers to deal with the config later. Signed-off-by: Wolfgang Bumiller --- PVE/QemuServer/Cloudinit.pm | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/PVE/QemuServer/Cloudinit.pm b/PVE/QemuServer/Cloudinit.pm index b616c7b..f9bcbbc 100644 --- a/PVE/QemuServer/Cloudinit.pm +++ b/PVE/QemuServer/Cloudinit.pm @@ -576,37 +576,6 @@ sub generate_cloudinitconfig { $generator->($conf, $vmid, $drive, $volname, $storeid); }); - - my $cloudinitconf = delete $conf->{cloudinit}; - $cloudinitconf = {}; - - my @cloudinit_opts = keys %{PVE::QemuServer::cloudinit_config_properties()}; - push @cloudinit_opts, 'name'; - - for my $opt (@cloudinit_opts) { - - if ($opt =~ m/^ipconfig(\d+)/) { - my $netid = "net$1"; - next if !defined($conf->{$netid}); - $conf->{cloudinit}->{$netid} = $conf->{$netid}; - } - - $conf->{cloudinit}->{$opt} = $conf->{$opt} if $conf->{$opt}; - } - - $conf->{cloudinit}->{name} = "VM$vmid" if !$conf->{cloudinit}->{name}; - - for my $opt (keys %{$conf}) { - if (PVE::QemuServer::is_valid_drivename($opt)) { - my $drive = PVE::QemuServer::parse_drive($opt, $conf->{$opt}); - if (PVE::QemuServer::drive_is_cloudinit($drive)) { - $conf->{cloudinit}->{$opt} = $conf->{$opt}; - } - } - } - - PVE::QemuConfig->write_config($vmid, $conf); - } sub dump_cloudinit_config { -- 2.30.2