From dcabc8576eeaa5d26a36643605731b98dc8a45e8 Mon Sep 17 00:00:00 2001 From: Mike Gerber Date: Wed, 3 Sep 2025 18:19:55 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Update/fix=20for=20Debian=2013?= =?UTF-8?q?=20trixie?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- check_kernel | 2 +- check_kernel_test.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/check_kernel b/check_kernel index c8ba054..cad3b8d 100755 --- a/check_kernel +++ b/check_kernel @@ -70,7 +70,7 @@ def running_kernel_version(): if re.search(r'Debian', proc_version_): # Remove gcc version first - proc_version_ = re.sub(r'\(gcc.*?\)', '', proc_version_) + proc_version_ = re.sub(r'\(([^\(]*-gnu-)?gcc.*?\)', '', proc_version_) # Then look for the Debian kernel version m = re.search(r'((?<=Debian )(\S+)|(?<=PVE )(\S+))', proc_version_) diff --git a/check_kernel_test.py b/check_kernel_test.py index 7263f13..815ccde 100644 --- a/check_kernel_test.py +++ b/check_kernel_test.py @@ -76,6 +76,10 @@ class RunningKernelVersionTestCase(unittest.TestCase): self.assertEqual(check_kernel.running_kernel_version(), Version('5.10.46-4')) + patch_object(check_kernel, 'proc_version', return_value='Linux version 6.12.41+deb13-amd64 (debian-kernel@lists.debian.org) (x86_64-linux-gnu-gcc-14 (Debian 14.2.0-19) 14.2.0, GNU ld (GNU Binutils for Debian) 2.44) #1 SMP PREEMPT_DYNAMIC Debian 6.12.41-1 (2025-08-12)') + self.assertEqual(check_kernel.running_kernel_version(), + Version('6.12.41-1')) + def testDebianProxmox(self): patch_object(check_kernel, 'proc_version', return_value='Linux version 5.4.162-1-pve (build@proxmox) (gcc version 8.3.0 (Debian 8.3.0-6)) #1 SMP PVE 5.4.162-2 (Thu, 20 Jan 2022 16:38:53 +0100)') self.assertEqual(check_kernel.running_kernel_version(),