From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 025051FF38C for ; Fri, 17 May 2024 14:22:43 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 08868122FE; Fri, 17 May 2024 14:22:55 +0200 (CEST) Message-ID: <30a9a48d-0fe9-42d1-827b-3fb79d83744e@proxmox.com> Date: Fri, 17 May 2024 14:22:20 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Beta To: Proxmox VE development discussion , Fiona Ebner References: <20240517083152.133866-1-f.ebner@proxmox.com> Content-Language: en-US From: Dominik Csapak In-Reply-To: <20240517083152.133866-1-f.ebner@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.016 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 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] pve7to8: detect kernel 6.8.x as a valid running kernel 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: , Reply-To: Proxmox VE development discussion Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" On 5/17/24 10:31, Fiona Ebner wrote: > Reported in the community forum: > https://forum.proxmox.com/threads/145723/post-664612 > > Signed-off-by: Fiona Ebner > --- > PVE/CLI/pve7to8.pm | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/PVE/CLI/pve7to8.pm b/PVE/CLI/pve7to8.pm > index b34c8362..8443f1fb 100644 > --- a/PVE/CLI/pve7to8.pm > +++ b/PVE/CLI/pve7to8.pm > @@ -204,7 +204,7 @@ sub check_pve_packages { > } > > # FIXME: better differentiate between 6.2 from bullseye or bookworm > - my ($krunning, $kinstalled) = (qr/6\.(?:2\.(?:[2-9]\d+|1[6-8]|1\d\d+)|5)[^~]*$/, 'proxmox-kernel-6.2'); > + my ($krunning, $kinstalled) = (qr/6\.(?:2\.(?:[2-9]\d+|1[6-8]|1\d\d+)|5|8)[^~]*$/, 'proxmox-kernel-6.2'); > if (!$upgraded) { > # we got a few that avoided 5.15 in cluster with mixed CPUs, so allow older too > ($krunning, $kinstalled) = (qr/(?:5\.(?:13|15)|6\.2)/, 'pve-kernel-5.15'); wouldn't it be more future proof to just check if the kernel is a -pve one and the version is higher (or equal) than what was shipped in pve7 ? i guess the same thing will happen for pve8to9 sooner or later... _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel