Merge pull request #748 from tmm1/patch-4
[host] Trim null bytes from unix.Uname() results
This commit is contained in:
commit
903a879e03
|
@ -380,7 +380,7 @@ func KernelVersionWithContext(ctx context.Context) (version string, err error) {
|
|||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
return string(utsname.Release[:]), nil
|
||||
return string(utsname.Release[:bytes.IndexByte(utsname.Release[:], 0)]), nil
|
||||
}
|
||||
|
||||
func getSlackwareVersion(contents []string) string {
|
||||
|
|
|
@ -3,11 +3,13 @@
|
|||
package host
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
|
||||
"golang.org/x/sys/unix"
|
||||
)
|
||||
|
||||
func kernelArch() (string, error) {
|
||||
var utsname unix.Utsname
|
||||
err := unix.Uname(&utsname)
|
||||
return string(utsname.Machine[:]), err
|
||||
return string(utsname.Machine[:bytes.IndexByte(utsname.Machine[:], 0)]), err
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue