handle pve-kernel -> proxmox-kernel rename

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

diff --git a/src/PMG/API2/APT.pm b/src/PMG/API2/APT.pm
index 7fc7c293cb3008d97d70e5cc2984f864c5382d3f..bcd749b245febe6523af4e47ad9522507b223269 100644 (file)
--- 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 85e9f16dc81b065004d30627e06f9fd7d9a4558c..8cccde1f3cabf9d2243f3b44bd3fb70d073d54de 100644 (file)
--- 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 50fbcbd421aec9acc3b4c9ed9480492e80ea1f2e..7e2f5be8e957d6fc35d6d1c6658b8203f676ef07 100755 (executable)
--- 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;