* [pbs-devel] [PATCH proxmox-backup] pbs2to3: fix #5600: expect any kernel 6.x version above 6.2.16
@ 2024-08-23 14:37 Daniel Kral
2024-08-26 7:06 ` Maximiliano Sandoval
2024-09-10 14:12 ` Fiona Ebner
0 siblings, 2 replies; 3+ messages in thread
From: Daniel Kral @ 2024-08-23 14:37 UTC (permalink / raw)
To: pbs-devel
Fixes a minor bug where `pbs2to3` shows an incorrect warning about an
incompatible kernel version, where newer kernel versions than 6.5.* were
marked as unexpected.
Signed-off-by: Daniel Kral <d.kral@proxmox.com>
---
src/bin/pbs2to3.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/pbs2to3.rs b/src/bin/pbs2to3.rs
index 1f895abd..194a077e 100644
--- a/src/bin/pbs2to3.rs
+++ b/src/bin/pbs2to3.rs
@@ -130,7 +130,7 @@ impl Checker {
self.output.log_info("Check running kernel version..")?;
let (krunning, kinstalled) = if self.upgraded {
(
- Regex::new(r"^6\.(?:2\.(?:[2-9]\d+|1[6-8]|1\d\d+)|5)[^~]*$")?,
+ Regex::new(r"^6\.(?:2\.(?:[2-9]\d+|1[6-8]|1\d\d+)|([5-9]|\d{2,}))[^~]*$")?,
"proxmox-kernel-6.2",
)
} else {
--
2.39.2
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [pbs-devel] [PATCH proxmox-backup] pbs2to3: fix #5600: expect any kernel 6.x version above 6.2.16
2024-08-23 14:37 [pbs-devel] [PATCH proxmox-backup] pbs2to3: fix #5600: expect any kernel 6.x version above 6.2.16 Daniel Kral
@ 2024-08-26 7:06 ` Maximiliano Sandoval
2024-09-10 14:12 ` Fiona Ebner
1 sibling, 0 replies; 3+ messages in thread
From: Maximiliano Sandoval @ 2024-08-26 7:06 UTC (permalink / raw)
To: Daniel Kral; +Cc: pbs-devel
Daniel Kral <d.kral@proxmox.com> writes:
> Fixes a minor bug where `pbs2to3` shows an incorrect warning about an
> incompatible kernel version, where newer kernel versions than 6.5.* were
> marked as unexpected.
>
> Signed-off-by: Daniel Kral <d.kral@proxmox.com>
I think this would benefit from a small #[test] where a few kernel
versions are tested.
--
Maximiliano
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [pbs-devel] [PATCH proxmox-backup] pbs2to3: fix #5600: expect any kernel 6.x version above 6.2.16
2024-08-23 14:37 [pbs-devel] [PATCH proxmox-backup] pbs2to3: fix #5600: expect any kernel 6.x version above 6.2.16 Daniel Kral
2024-08-26 7:06 ` Maximiliano Sandoval
@ 2024-09-10 14:12 ` Fiona Ebner
1 sibling, 0 replies; 3+ messages in thread
From: Fiona Ebner @ 2024-09-10 14:12 UTC (permalink / raw)
To: Proxmox Backup Server development discussion, Daniel Kral
Am 23.08.24 um 16:37 schrieb Daniel Kral:
> Fixes a minor bug where `pbs2to3` shows an incorrect warning about an
> incompatible kernel version, where newer kernel versions than 6.5.* were
> marked as unexpected.
>
> Signed-off-by: Daniel Kral <d.kral@proxmox.com>
> ---
> src/bin/pbs2to3.rs | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/bin/pbs2to3.rs b/src/bin/pbs2to3.rs
> index 1f895abd..194a077e 100644
> --- a/src/bin/pbs2to3.rs
> +++ b/src/bin/pbs2to3.rs
> @@ -130,7 +130,7 @@ impl Checker {
> self.output.log_info("Check running kernel version..")?;
> let (krunning, kinstalled) = if self.upgraded {
> (
> - Regex::new(r"^6\.(?:2\.(?:[2-9]\d+|1[6-8]|1\d\d+)|5)[^~]*$")?,
> + Regex::new(r"^6\.(?:2\.(?:[2-9]\d+|1[6-8]|1\d\d+)|([5-9]|\d{2,}))[^~]*$")?,
> "proxmox-kernel-6.2",
> )
> } else {
In PVE and PMG we allow arbitrary newer -pve kernels for
future-proofing, it would be nice to do the same here too:
https://git.proxmox.com/?p=pve-manager.git;a=commit;h=fb59038a8b110b0b0b438ec035fd41dd9d591232
https://git.proxmox.com/?p=pmg-api.git;a=commit;h=9d67a9af218b73027822c9c4665b88e6662e7ef7
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-09-10 14:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-08-23 14:37 [pbs-devel] [PATCH proxmox-backup] pbs2to3: fix #5600: expect any kernel 6.x version above 6.2.16 Daniel Kral
2024-08-26 7:06 ` Maximiliano Sandoval
2024-09-10 14:12 ` Fiona Ebner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox