From 8f5239ab4429feef98a2d032eee9da405b195f53 Mon Sep 17 00:00:00 2001
From: Tobias Klauser <tklauser@distanz.ch>
Date: Fri, 15 Nov 2024 16:29:04 +0100
Subject: [PATCH] machine: use unix.ByteSliceToString

Use the convenience function ByteSliceToString from x/sys/unix to
convert Utsname members to string.
---
 machine/info.go    | 5 +----
 machine/machine.go | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/machine/info.go b/machine/info.go
index 76d2272f6a..6e91095c6d 100644
--- a/machine/info.go
+++ b/machine/info.go
@@ -15,7 +15,6 @@
 package machine
 
 import (
-	"bytes"
 	"flag"
 	"os"
 	"path/filepath"
@@ -169,10 +168,8 @@ func ContainerOsVersion() string {
 
 func KernelVersion() string {
 	uname := &unix.Utsname{}
-
 	if err := unix.Uname(uname); err != nil {
 		return "Unknown"
 	}
-
-	return string(uname.Release[:bytes.IndexByte(uname.Release[:], 0)])
+	return unix.ByteSliceToString(uname.Release[:])
 }
diff --git a/machine/machine.go b/machine/machine.go
index 0ba161614f..a3699a140d 100644
--- a/machine/machine.go
+++ b/machine/machine.go
@@ -257,7 +257,7 @@ func getMachineArch() string {
 		klog.Errorf("Cannot get machine architecture, err: %v", err)
 		return ""
 	}
-	return string(uname.Machine[:])
+	return unix.ByteSliceToString(uname.Machine[:])
 }
 
 // arm32 changes