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 86DF0820D for ; Mon, 21 Aug 2023 14:51:00 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 68C501AF for ; Mon, 21 Aug 2023 14:50:30 +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 for ; Mon, 21 Aug 2023 14:50:29 +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 AC51342D39 for ; Mon, 21 Aug 2023 14:50:29 +0200 (CEST) Message-ID: <324817da-4c12-a98b-62af-eb9333729edc@proxmox.com> Date: Mon, 21 Aug 2023 14:50:28 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.14.0 Content-Language: en-US To: Proxmox VE development discussion , Christoph Heiss References: <20230228105911.217085-1-c.heiss@proxmox.com> From: Fiona Ebner In-Reply-To: <20230228105911.217085-1-c.heiss@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 2.072 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -4.279 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 Subject: Re: [pve-devel] [PATCH container] setup: Fix architecture detection for NixOS containers 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: Mon, 21 Aug 2023 12:51:00 -0000 Am 28.02.23 um 11:59 schrieb Christoph Heiss: > diff --git a/src/PVE/LXC/Setup.pm b/src/PVE/LXC/Setup.pm > index 891231f..4346c5e 100644 > --- a/src/PVE/LXC/Setup.pm > +++ b/src/PVE/LXC/Setup.pm > @@ -131,6 +131,20 @@ sub new { > $plugin->{rootgid} = $rootgid; > } > > + # if arch is unset, we try to autodetect it > + if (!defined($conf->{arch})) { > + my $arch = eval { $self->protected_call(sub { $plugin->detect_architecture() }) }; > + The error from the eval should be logged here. > + if (!defined($arch)) { > + $arch = 'amd64'; > + print "Falling back to $arch.\nUse `pct set VMID --arch ARCH` to change.\n"; > + } else { > + print "Detected container architecture: $arch\n"; > + } > + (...) > diff --git a/src/PVE/LXC/Setup/NixOS.pm b/src/PVE/LXC/Setup/NixOS.pm > index 845d2d5..4f7b93e 100644 > --- a/src/PVE/LXC/Setup/NixOS.pm > +++ b/src/PVE/LXC/Setup/NixOS.pm > @@ -5,6 +5,7 @@ use warnings; > > use File::Path 'make_path'; > > +use PVE::LXC::Setup; This is a cyclic include, please let us avoid those. We could either use a new helper module for the detect_architecture() helper or otherwise move it to pve-guest-common or even pve-common. The detection itself is pretty generic after all. An alternative to that would be to just add a function get_elf_fn() to the plugin interface and change the existing detect_architecture() to use that. > use PVE::LXC::Setup::Base; > > use base qw(PVE::LXC::Setup::Base);