Merge pull request #1889 from kolyshkin/kernel

pkg/parsers/kernel: simplify
containers · Apr 18, 2024 · 0b293c3 · 0b293c3
2 parents e6a80b3 + ae51baa
commit 0b293c3
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 92 deletions.
diff --git a/pkg/parsers/kernel/kernel_unix.go b/pkg/parsers/kernel/kernel_unix.go
@@ -1,35 +1,21 @@
-//go:build linux || freebsd || solaris || openbsd
-// +build linux freebsd solaris openbsd
-
 // Package kernel provides helper function to get, parse and compare kernel
 // versions for different platforms.
 package kernel
 
 import (
-	"bytes"
-
 	"github.com/sirupsen/logrus"
+	"golang.org/x/sys/unix"
 )
 
 // GetKernelVersion gets the current kernel version.
 func GetKernelVersion() (*VersionInfo, error) {
-	uts, err := uname()
-	if err != nil {
-		return nil, err
-	}
+	uts := &unix.Utsname{}
 
-	release := make([]byte, len(uts.Release))
-
-	i := 0
-	for _, c := range uts.Release {
-		release[i] = byte(c)
-		i++
+	if err := unix.Uname(uts); err != nil {
+		return nil, err
 	}
 
-	// Remove the \x00 from the release for Atoi to parse correctly
-	release = release[:bytes.IndexByte(release, 0)]
-
-	return ParseRelease(string(release))
+	return ParseRelease(unix.ByteSliceToString(uts.Release[:]))
 }
 
 // CheckKernelVersion checks if current kernel is newer than (or equal to)

diff --git a/pkg/parsers/kernel/uname_freebsd.go b/pkg/parsers/kernel/uname_freebsd.go
diff --git a/pkg/parsers/kernel/uname_linux.go b/pkg/parsers/kernel/uname_linux.go
diff --git a/pkg/parsers/kernel/uname_solaris.go b/pkg/parsers/kernel/uname_solaris.go
diff --git a/pkg/parsers/kernel/uname_unsupported.go b/pkg/parsers/kernel/uname_unsupported.go
diff --git a/pkg/parsers/kernel/uname_unsupported_type.go b/pkg/parsers/kernel/uname_unsupported_type.go