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 A348C70E8B for ; Wed, 9 Jun 2021 13:54:50 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 994A62390F for ; Wed, 9 Jun 2021 13:54:20 +0200 (CEST) Received: from kvmformation3.odiso.net (globalOdiso.M6Lille.odiso.net [89.248.211.242]) by firstgate.proxmox.com (Proxmox) with ESMTP id CADEF238D1 for ; Wed, 9 Jun 2021 13:54:18 +0200 (CEST) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 8652DD1930; Wed, 9 Jun 2021 13:54:18 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Wed, 9 Jun 2021 13:54:11 +0200 Message-Id: <20210609115417.3326775-2-aderumier@odiso.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210609115417.3326775-1-aderumier@odiso.com> References: <20210609115417.3326775-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.979 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% HEADER_FROM_DIFFERENT_DOMAINS 0.248 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.398 Relay HELO differs from its IP's reverse DNS NO_DNS_FOR_FROM 0.001 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 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 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: Wed, 09 Jun 2021 11:54:50 -0000 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"; + } + + 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); -- 2.20.1