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 18B1D1FF38E for ; Tue, 28 May 2024 12:59:21 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B83CC1503B; Tue, 28 May 2024 12:59:41 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Tue, 28 May 2024 12:59:23 +0200 Message-Id: <20240528105923.71673-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.060 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 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. [pve7to8.pm, proxmox.com] Subject: [pve-devel] [PATCH v2 manager] pve7to8: allow arbitrary newer running '-pve' kernels after upgrade 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-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" As recently reported in the community forum [0], 6.8 pve kernels would not be detected correctly by the script. Allow arbitrary newer versions if already upgraded for future-proofing. [0]: https://forum.proxmox.com/threads/145723/post-664612 Suggested-by: Dominik Csapak Signed-off-by: Fiona Ebner --- Changes in v2: * Allow arbitrary newer '-pve' kernels like Dominik suggested. PVE/CLI/pve7to8.pm | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/PVE/CLI/pve7to8.pm b/PVE/CLI/pve7to8.pm index b34c8362..5c308907 100644 --- a/PVE/CLI/pve7to8.pm +++ b/PVE/CLI/pve7to8.pm @@ -204,17 +204,30 @@ 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 $kinstalled = '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'); + $kinstalled = 'pve-kernel-5.15'; } + my $kernel_version_is_expected = sub { + my ($version) = @_; + + return $version =~ m/^(?:5\.(?:13|15)|6\.2)/ if !$upgraded; + + if ($version =~ m/^6\.(?:2\.(?:[2-9]\d+|1[6-8]|1\d\d+)|5)[^~]*$/) { + return 1; + } elsif ($version =~ m/^(\d+).(\d+)[^~]*-pve$/) { + return $1 >= 6 && $2 >= 2; + } + return; + }; + print "\nChecking running kernel version..\n"; my $kernel_ver = $proxmox_ve->{RunningKernel}; if (!defined($kernel_ver)) { log_fail("unable to determine running kernel version."); - } elsif ($kernel_ver =~ /^$krunning/) { + } elsif ($kernel_version_is_expected->($kernel_ver)) { if ($upgraded) { log_pass("running new kernel '$kernel_ver' after upgrade."); } else { @@ -227,7 +240,7 @@ sub check_pve_packages { log_warn("unexpected running and installed kernel '$kernel_ver'."); } - if ($upgraded && $kernel_ver =~ /^$krunning/) { + if ($upgraded && $kernel_version_is_expected->($kernel_ver)) { my $outdated_kernel_meta_pkgs = []; for my $kernel_meta_version ('5.4', '5.11', '5.13', '5.15') { my $pkg = "pve-kernel-${kernel_meta_version}"; -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel