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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id C914BE279 for ; Tue, 18 Jul 2023 11:11:11 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B379A18718 for ; Tue, 18 Jul 2023 11:11:11 +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 ; Tue, 18 Jul 2023 11:11:11 +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 1432742FD9 for ; Tue, 18 Jul 2023 11:11:11 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Tue, 18 Jul 2023 11:10:54 +0200 Message-Id: <20230718091102.6631-2-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230718091102.6631-1-f.gruenbichler@proxmox.com> References: <20230718091102.6631-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.070 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. [pmg7to8.pm, apt.pm, pmgupgrade.pm] Subject: [pve-devel] [PATCH pmg-api] handle pve-kernel -> proxmox-kernel rename 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: Tue, 18 Jul 2023 09:11:11 -0000 Signed-off-by: Fabian Grünbichler --- the proxmox-mailgateway meta package could get a versioned dep on pmg-api with this change, but it's not strictly required. src/PMG/API2/APT.pm | 2 +- src/PMG/CLI/pmg7to8.pm | 2 +- src/PMG/CLI/pmgupgrade.pm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/PMG/API2/APT.pm b/src/PMG/API2/APT.pm index 7fc7c29..bcd749b 100644 --- a/src/PMG/API2/APT.pm +++ b/src/PMG/API2/APT.pm @@ -789,7 +789,7 @@ __PACKAGE__->register_method({ my $aptver = $AptPkg::System::_system->versioning(); my $byver = sub { $aptver->compare($cache->{$b}->{CurrentVer}->{VerStr}, $cache->{$a}->{CurrentVer}->{VerStr}) }; - push @list, sort $byver grep { /^pve-kernel-/ && $cache->{$_}->{CurrentState} eq 'Installed' } keys %$cache; + push @list, sort $byver grep { /^(?:pve|proxmox)-kernel-/ && $cache->{$_}->{CurrentState} eq 'Installed' } keys %$cache; my @opt_pack = qw( ifupdown diff --git a/src/PMG/CLI/pmg7to8.pm b/src/PMG/CLI/pmg7to8.pm index 85e9f16..8cccde1 100644 --- a/src/PMG/CLI/pmg7to8.pm +++ b/src/PMG/CLI/pmg7to8.pm @@ -193,7 +193,7 @@ sub check_pmg_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)[^~]*$/, 'pve-kernel-6.2'); + my ($krunning, $kinstalled) = (qr/6\.(?:2\.(?:[2-9]\d+|1[6-8]|1\d\d+)|5)[^~]*$/, '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'); diff --git a/src/PMG/CLI/pmgupgrade.pm b/src/PMG/CLI/pmgupgrade.pm index 50fbcbd..56d9c87 100755 --- a/src/PMG/CLI/pmgupgrade.pm +++ b/src/PMG/CLI/pmgupgrade.pm @@ -66,7 +66,7 @@ __PACKAGE__->register_method ({ my $newkernel; foreach my $p (@$oldlist) { - if (($p->{Package} =~ m/^pve-kernel/) && + if (($p->{Package} =~ m/^(:?pve|proxmox)-kernel/) && !grep { $_->{Package} eq $p->{Package} } @$pkglist) { $newkernel = 1; last; -- 2.39.2