proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-04-28 15:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

handle pve-kernel -> proxmox-kernel rename

Browse Source 
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2023-07-18 10:31:34 +02:00
parent c62f096e2b
commit 3fc687f57b
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PVE/API2/APT.pm
View File

@ -789,7 +789,7 @@ __PACKAGE__->register_method({
my $aptver = $AptPkg::System::_system->versioning(); my $aptver = $AptPkg::System::_system->versioning();
my $byver = sub { $aptver->compare($cache->{$b}->{CurrentVer}->{VerStr}, $cache->{$a}->{CurrentVer}->{VerStr}) }; 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( my @opt_pack = qw(
ceph ceph

2
PVE/CLI/pve7to8.pm
View File

@ -204,7 +204,7 @@ sub check_pve_packages {
} }
# FIXME: better differentiate between 6.2 from bullseye or bookworm # 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) { if (!$upgraded) {
# we got a few that avoided 5.15 in cluster with mixed CPUs, so allow older too # 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'); ($krunning, $kinstalled) = (qr/(?:5\.(?:13|15)|6\.2)/, 'pve-kernel-5.15');

2
bin/pveupgrade
View File

@ -61,7 +61,7 @@ if (!$st || (time() - $st->mtime) > (3*24*3600)) {
my $newkernel; my $newkernel;
foreach my $p (@$oldlist) { foreach my $p (@$oldlist) {
if (($p->{Package} =~ m/^pve-kernel/) && if (($p->{Package} =~ m/^(?:pve|proxmox)-kernel/) &&
!grep { $_->{Package} eq $p->{Package} } @$pkglist) { !grep { $_->{Package} eq $p->{Package} } @$pkglist) {
$newkernel = 1; $newkernel = 1;
last; last;