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 B691B946B for ; Thu, 31 Mar 2022 15:01:18 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A4D9D1BBA5 for ; Thu, 31 Mar 2022 15:01:18 +0200 (CEST) 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 id 7FD471BB46 for ; Thu, 31 Mar 2022 15:01:17 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 5713443541; Thu, 31 Mar 2022 15:01:17 +0200 (CEST) Message-ID: <1d545297-b7ac-d663-8985-9d8a6069c86e@proxmox.com> Date: Thu, 31 Mar 2022 15:01:15 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Content-Language: en-US To: pve-devel@lists.proxmox.com, aderumier@odiso.com References: <20210609115417.3326775-1-aderumier@odiso.com> <20210609115417.3326775-2-aderumier@odiso.com> From: Fabian Ebner In-Reply-To: <20210609115417.3326775-2-aderumier@odiso.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.114 Adjusted score from AWL reputation of From: address 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 Alignment NICE_REPLY_A -0.001 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - 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: Re: [pve-devel] [PATCH v3 qemu-server 1/7] cloudinit: add vm config to cloudinit drive 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: Thu, 31 Mar 2022 13:01:18 -0000 Am 09.06.21 um 13:54 schrieb Alexandre Derumier: > To have current running cloudinit config. > > An improvement could be to implement parsing of config drive format, > and also compare cicustom snippets content > > Signed-off-by: Alexandre Derumier > --- > PVE/QemuServer/Cloudinit.pm | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/PVE/QemuServer/Cloudinit.pm b/PVE/QemuServer/Cloudinit.pm > index a5474d3..abc62b7 100644 > --- a/PVE/QemuServer/Cloudinit.pm > +++ b/PVE/QemuServer/Cloudinit.pm > @@ -19,6 +19,7 @@ sub commit_cloudinit_disk { > > my $path = "/run/pve/cloudinit/$vmid/"; > mkpath $path; > + > foreach my $filepath (keys %$files) { > if ($filepath !~ m@^(.*)\/[^/]+$@) { > die "internal error: bad file name in cloud-init image: $filepath\n"; > @@ -30,6 +31,15 @@ sub commit_cloudinit_disk { > file_set_contents("$path/$filepath", $contents); > } > > + mkpath "$path/proxmox"; > + my $confcontent = ""; > + foreach my $opt (keys %$conf) { > + next if $opt =~ m/^(pending|snapshots|digest)$/; > + $confcontent .= "$opt: $conf->{$opt}\n"; > + } For consistency, I'd use write_vm_config() (after dclone() and removing the snapshots, pending) to generate the contents of the file. > + > + file_set_contents("$path/proxmox/vmconf", $confcontent); > + > my $storecfg = PVE::Storage::config(); > my $iso_path = PVE::Storage::path($storecfg, $drive->{file}); > my $scfg = PVE::Storage::storage_config($storecfg, $storeid);