[pve-devel] [PATCH manager] pve7to8: detect kernel 6.8.x as a valid running kernel

[pve-devel] [PATCH manager] pve7to8: detect kernel 6.8.x as a valid running kernel

[Fiona Ebner]

Reported in the community forum:
https://forum.proxmox.com/threads/145723/post-664612

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
 PVE/CLI/pve7to8.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PVE/CLI/pve7to8.pm b/PVE/CLI/pve7to8.pm
index b34c8362..8443f1fb 100644
--- 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)[^~]*$/, 'proxmox-kernel-6.2');
+	my ($krunning, $kinstalled) = (qr/6\.(?:2\.(?:[2-9]\d+|1[6-8]|1\d\d+)|5|8)[^~]*$/, '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');
-- 
2.39.2



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

Re: [pve-devel] [PATCH manager] pve7to8: detect kernel 6.8.x as a valid running kernel

[Dominik Csapak]

On 5/17/24 10:31, Fiona Ebner wrote:
> Reported in the community forum:
> https://forum.proxmox.com/threads/145723/post-664612
> 
> Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
> ---
>   PVE/CLI/pve7to8.pm | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/PVE/CLI/pve7to8.pm b/PVE/CLI/pve7to8.pm
> index b34c8362..8443f1fb 100644
> --- 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)[^~]*$/, 'proxmox-kernel-6.2');
> +	my ($krunning, $kinstalled) = (qr/6\.(?:2\.(?:[2-9]\d+|1[6-8]|1\d\d+)|5|8)[^~]*$/, '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');

wouldn't it be more future proof to just check if the kernel is a -pve one and the version is higher 
(or equal) than what was shipped in pve7 ?

i guess the same thing will happen for pve8to9 sooner or later...


_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

Re: [pve-devel] [PATCH manager] pve7to8: detect kernel 6.8.x as a valid running kernel

[Fiona Ebner]

Am 17.05.24 um 14:22 schrieb Dominik Csapak:
> On 5/17/24 10:31, Fiona Ebner wrote:
>> Reported in the community forum:
>> https://forum.proxmox.com/threads/145723/post-664612
>>
>> Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
>> ---
>>   PVE/CLI/pve7to8.pm | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/PVE/CLI/pve7to8.pm b/PVE/CLI/pve7to8.pm
>> index b34c8362..8443f1fb 100644
>> --- 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)[^~]*$/, 'proxmox-kernel-6.2');
>> +    my ($krunning, $kinstalled) =
>> (qr/6\.(?:2\.(?:[2-9]\d+|1[6-8]|1\d\d+)|5|8)[^~]*$/,
>> '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');
> 
> wouldn't it be more future proof to just check if the kernel is a -pve
> one and the version is higher (or equal) than what was shipped in pve7 ?
> 
> i guess the same thing will happen for pve8to9 sooner or later...
> 

Sent a v2 with that approach:
https://lists.proxmox.com/pipermail/pve-devel/2024-May/064005.html


_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel