handle pve-kernel -> proxmox-kernel rename

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

diff --git a/PVE/API2/APT.pm b/PVE/API2/APT.pm
index 6694dbeb62fddf02f195c57d4a99c484eeddcff0..f73535e158ae9ffb0c3db168367525a82d187152 100644 (file)
--- a/PVE/API2/APT.pm
+++ b/PVE/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(
            ceph

diff --git a/PVE/CLI/pve7to8.pm b/PVE/CLI/pve7to8.pm
index 5ba738372d0a4eaeaa6ab57e27c701797af53996..ff8e6045f5f28c9ae2620f2ee48c60d8b8b5c6b3 100644 (file)
--- 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)[^~]*$/, '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/bin/pveupgrade b/bin/pveupgrade
index 0ce01824dbfb410c40df1316d467d6c41b195c06..04b3f7ac3f95db077fc334920251d7879ae7bcec 100755 (executable)
--- a/bin/pveupgrade
+++ b/bin/pveupgrade
@@ -61,7 +61,7 @@ if (!$st || (time() - $st->mtime) > (3*24*3600)) {
 
     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;