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 3614294A1 for ; Thu, 31 Mar 2022 15:01:35 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6FC201BD4E for ; Thu, 31 Mar 2022 15:01:34 +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 D90641BD43 for ; Thu, 31 Mar 2022 15:01:33 +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 B110D43529; Thu, 31 Mar 2022 15:01:33 +0200 (CEST) Message-ID: <8c59eac3-86b4-5e89-1e7c-9fb493d4b2da@proxmox.com> Date: Thu, 31 Mar 2022 15:01:32 +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-6-aderumier@odiso.com> From: Fabian Ebner In-Reply-To: <20210609115417.3326775-6-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 5/7] cloudinit : add extract_cloudinit_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: Thu, 31 Mar 2022 13:01:35 -0000 Am 09.06.21 um 13:54 schrieb Alexandre Derumier: > --- a/PVE/QemuServer/Cloudinit.pm > +++ b/PVE/QemuServer/Cloudinit.pm > @@ -607,11 +607,56 @@ sub dump_cloudinit_config { > } > } > > +sub extract_cloudinit_config { > + my ($conf, $vmid) = @_; > + > + my $current_drive = undef; > + PVE::QemuConfig->foreach_volume($conf, sub { > + my ($ds, $drive) = @_; > + $current_drive = $drive if PVE::QemuServer::drive_is_cloudinit($drive); > + Style nit: blank line shouldn't be there > + }); > + Style nit: above line starts with a space > + my $running = PVE::QemuServer::check_running($vmid); > + my $storecfg = PVE::Storage::config(); > + my $iso_path = PVE::Storage::path($storecfg, $current_drive->{file}); > + my ($storeid, $volname) = PVE::Storage::parse_volume_id($current_drive->{file}, 1); > + my $scfg = PVE::Storage::storage_config($storecfg, $storeid); > + my $format = PVE::QemuServer::qemu_img_format($scfg, $volname); > + my $plugin = PVE::Storage::Plugin->lookup($scfg->{type}); > + $plugin->activate_volume($storeid, $scfg, $volname) if !$running; Please use the abstraction the storage module provides, i.e. PVE::Storage::activate_volumes(). > + > + my $raw_cloudinit_config = undef; > + > + my $path = "/run/pve/cloudinit_current/$vmid"; > + mkpath $path; > + my $parser = sub { > + my $line = shift; > + $raw_cloudinit_config .= "$line\n"; > + }; > + eval { > + #qemu-img dd is really slower (5s) than convert (0.2s) > + run_command([ > + ['qemu-img', 'convert', '-f', 'raw', '-O', 'raw', "$iso_path", "$path/iso"] Should use $format (or it won't work for qcow2). No need for the second surrounding []. > + ]); > + > + run_command([ Also shouldn't need the second [] I think. > + ['isoinfo', '-i', "$path/iso", '-x', "/PROXMOX/VMCONF.\;1"] > + ], outfunc => $parser); > + }; > + rmtree($path); > + $plugin->deactivate_volume($storeid, $scfg, $volname) if !$running; PVE::Storage::deactivate_volumes(). > + > + my $cloudinit_config = PVE::QemuServer::parse_vm_config("/qemu-server/$vmid.conf", $raw_cloudinit_config); > + return $cloudinit_config; Style nit: no need to introduce that variable > +} > +