From 5bb73c90c50172d32baedea6e446c46ca519fd65 Mon Sep 17 00:00:00 2001 From: David McFarlane <54093156+Prepultrue@users.noreply.github.com> Date: Tue, 18 Jun 2024 11:06:29 +1000 Subject: [PATCH] Accept + within kernel versions --- CHANGELOG.md | 1 + internal/pkg/kernel/kernel.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 27799531..f31a6f0e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -56,6 +56,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Changed - Explicitly ignore compat-style NIS lines in passwd/group during syncuser. #1286 +- Accept `+` within kernel version. #1268 ## v4.5.4, 2024-06-12 diff --git a/internal/pkg/kernel/kernel.go b/internal/pkg/kernel/kernel.go index 40ee7321..4e8a1a03 100644 --- a/internal/pkg/kernel/kernel.go +++ b/internal/pkg/kernel/kernel.go @@ -252,7 +252,7 @@ func FindKernel(root string) (kPath string, version string, err error) { } for _, foundKernel := range potentialKernel { wwlog.Debug("Parsing out kernel version for %s", foundKernel) - re := regexp.MustCompile(fmt.Sprintf(path.Join(root, searchPath), `([\w\d-\.]*)`)) + re := regexp.MustCompile(fmt.Sprintf(path.Join(root, searchPath), `([\w\d-\.+]*)`)) version := re.FindAllStringSubmatch(foundKernel, -1) if version == nil { return foundKernel, "", fmt.Errorf("could not parse kernel version")