From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <c.ebner@proxmox.com>
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) server-digest SHA256)
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id BAD9BEA8F
for <pve-devel@lists.proxmox.com>; Wed, 27 Sep 2023 08:58:47 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id A564A8EF5
for <pve-devel@lists.proxmox.com>; Wed, 27 Sep 2023 08:58:47 +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) server-digest SHA256)
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS
for <pve-devel@lists.proxmox.com>; Wed, 27 Sep 2023 08:58:46 +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 DFA1744755
for <pve-devel@lists.proxmox.com>; Wed, 27 Sep 2023 08:58:45 +0200 (CEST)
Date: Wed, 27 Sep 2023 08:58:44 +0200 (CEST)
From: Christian Ebner <c.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Message-ID: <1902644527.4866.1695797924894@webmail.proxmox.com>
In-Reply-To: <20230828075414.9729-1-c.ebner@proxmox.com>
References: <20230828075414.9729-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-Rev50
X-Originating-Client: open-xchange-appsuite
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.051 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
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
information. [proxmox.com, pve7to8.pm]
Subject: Re: [pve-devel] [PATCH manager master stable-7] pve7to8: Fix Fedora
38 systemd unified cgroupv2 check
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Wed, 27 Sep 2023 06:58:47 -0000
Ping, see also https://forum.proxmox.com/threads/128721/
> On 28.08.2023 09:54 CEST Christian Ebner <c.ebner@proxmox.com> wrote:
>
>
> For Fedora 38 the systemd shared object files used to check the systemd
> version are located at /usr/lib64/systemd or /usr/lib/systemd.
> Therefore, include /usr/lib64/systemd in the list of directories to
> check.
>
> Further, Fedora 38 adds a fc38 postfix to the filename, so expand the
> regex to cover that as well.
>
> Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
> ---
>
> Reported by users via the forum:
> https://forum.proxmox.com/threads/128721/#post-584456
>
> PVE/CLI/pve7to8.pm | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/PVE/CLI/pve7to8.pm b/PVE/CLI/pve7to8.pm
> index ff8e6045..3947b260 100644
> --- a/PVE/CLI/pve7to8.pm
> +++ b/PVE/CLI/pve7to8.pm
> @@ -1022,12 +1022,18 @@ sub check_containers_cgroup_compat {
> my $get_systemd_version = sub {
> my ($self) = @_;
>
> + my @dirs = (
> + '/lib/systemd',
> + '/usr/lib/systemd',
> + '/usr/lib/x86_64-linux-gnu/systemd',
> + '/usr/lib64/systemd'
> + );
> my $libsd;
> - for my $dir ('/lib/systemd', '/usr/lib/systemd', '/usr/lib/x86_64-linux-gnu/systemd') {
> + for my $dir (@dirs) {
> $libsd = PVE::Tools::dir_glob_regex($dir, "libsystemd-shared-.+\.so");
> last if defined($libsd);
> }
> - if (defined($libsd) && $libsd =~ /libsystemd-shared-(\d+)(\.\d-\d)?\.so/) {
> + if (defined($libsd) && $libsd =~ /libsystemd-shared-(\d+)(\.\d-\d)?(\.fc\d\d)?\.so/) {
> return $1;
> }
>
> --
> 2.39.2