webnet/tailscale
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

tstest: fix kernel version parsing for Debian-style version strings

Browse Source 
The kernel version parser used strings.Cut with "-" to handle versions
like "5.4.0-76-generic", but Debian uses "+" in versions like
"6.12.41+deb13-amd64".

Use strings.IndexAny to find the first "-" or "+" and truncate there.

Fixes TestKernelVersion on Debian systems.

Fixes #19395

Change-Id: I70e5f95682d54baf908e51f9f4b51c130b00aaaa
Co-Authored-By: Brad Fitzpatrick <bradfitz@tailscale.com>
Signed-off-by: Avery Pennarun <apenwarr@tailscale.com>
This commit is contained in:
Avery Pennarun
2026-04-13 03:52:19 +02:00
committed by Brad Fitzpatrick
parent 6aa10576c9
commit 621dc9cf1b
2 changed files with 46 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tstest/kernel_linux.go
+12 -4
View File
@@ -20,8 +20,13 @@ func KernelVersion() (major, minor, patch int) {
return 0, 0, 0
}
release := unix.ByteSliceToString(uname.Release[:])
return parseKernelVersion(release)
}
// Parse version string (e.g., "5.15.0-...")
// parseKernelVersion parses a Linux kernel version string like "6.12.73+deb13-amd64"
// or "5.15.0-76-generic" and returns the major, minor, and patch components.
// It returns (0, 0, 0) if the version cannot be parsed.
func parseKernelVersion(release string) (major, minor, patch int) {
parts := strings.Split(release, ".")
if len(parts) < 3 {
return 0, 0, 0
@@ -37,9 +42,12 @@ func KernelVersion() (major, minor, patch int) {
return 0, 0, 0
}
// Patch version may have additional info after a hyphen (e.g., "0-76-generic")
// Extract just the numeric part before any hyphen
patchStr, _, _ := strings.Cut(parts[2], "-")
// Patch version may have additional info after a hyphen or plus (e.g., "0-76-generic" or "41+deb13-amd64")
// Extract just the numeric part before any hyphen or plus
patchStr := parts[2]
if idx := strings.IndexAny(patchStr, "-+"); idx != -1 {
patchStr = patchStr[:idx]
}
patch, err = strconv.Atoi(patchStr)
if err != nil {