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 4F09DA0204 for ; Mon, 12 Jun 2023 12:21:51 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3070321A33 for ; Mon, 12 Jun 2023 12:21:51 +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, 12 Jun 2023 12:21:50 +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 6942743B5B for ; Mon, 12 Jun 2023 12:21:50 +0200 (CEST) Date: Mon, 12 Jun 2023 12:21:49 +0200 (CEST) From: Christian Ebner To: pve-devel@lists.proxmox.com Message-ID: <2031035742.992.1686565309810@webmail.proxmox.com> In-Reply-To: <20230612100640.32337-1-c.ebner@proxmox.com> References: <20230612100640.32337-1-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Priority: 3 Importance: Normal X-Mailer: Open-Xchange Mailer v7.10.6-Rev45 X-Originating-Client: open-xchange-appsuite X-SPAM-LEVEL: Spam detection results: 0 AWL -0.161 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 POISEN_SPAM_PILL 0.1 Meta: its spam POISEN_SPAM_PILL_1 0.1 random spam to be learned in bayes POISEN_SPAM_PILL_3 0.1 random spam to be learned in bayes 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 - Subject: Re: [pve-devel] [PATCH] pve7to8: Improve systemd unified cgroupv2 support check 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, 12 Jun 2023 10:21:51 -0000 Ignore this one, it is still incomplete as Debian 12 stores the shared object at /usr/lib/x86_64-linux-gnu/systemd. Will include that too and send a v2. > On 12.06.2023 12:06 CEST Christian Ebner wrote: > > > Checking /lib/systemd if it is present and a directory is not enough, as > the shared object file used to check the version might nevertheless be > located at /usr/lib/systemd. So check also the latter, if the former > returned no match. > > Further, Arch Linux appends the minor version and release version to the > filename, so include that in the regex as well. > > Signed-off-by: Christian Ebner > --- > PVE/CLI/pve7to8.pm | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/PVE/CLI/pve7to8.pm b/PVE/CLI/pve7to8.pm > index 6b51e98e..3061b691 100644 > --- a/PVE/CLI/pve7to8.pm > +++ b/PVE/CLI/pve7to8.pm > @@ -1015,9 +1015,11 @@ sub check_containers_cgroup_compat { > my $get_systemd_version = sub { > my ($self) = @_; > > - my $sd_lib_dir = -d "/lib/systemd" ? "/lib/systemd" : "/usr/lib/systemd"; > - my $libsd = PVE::Tools::dir_glob_regex($sd_lib_dir, "libsystemd-shared-.+\.so"); > - if (defined($libsd) && $libsd =~ /libsystemd-shared-(\d+)\.so/) { > + my $libsd = PVE::Tools::dir_glob_regex("/lib/systemd", "libsystemd-shared-.+\.so"); > + if (!defined($libsd)) { > + $libsd = PVE::Tools::dir_glob_regex("/usr/lib/systemd", "libsystemd-shared-.+\.so"); > + } > + if (defined($libsd) && $libsd =~ /libsystemd-shared-(\d+)(\.\d-\d)?\.so/) { > return $1; > } > > -- > 2.39.2