Merge pull request #576 from Lomanic/issue574

Fix #574
pull/595/head
shirou 7 years ago committed by GitHub
commit 62f689bda3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -38,12 +38,9 @@ func InfoWithContext(ctx context.Context) (*InfoStat, error) {
ret.Hostname = hostname ret.Hostname = hostname
} }
uname, err := exec.LookPath("uname") kernelVersion, err := KernelVersionWithContext(ctx)
if err == nil {
out, err := invoke.CommandWithContext(ctx, uname, "-r")
if err == nil { if err == nil {
ret.KernelVersion = strings.ToLower(strings.TrimSpace(string(out))) ret.KernelVersion = kernelVersion
}
} }
platform, family, pver, err := PlatformInformation() platform, family, pver, err := PlatformInformation()
@ -214,7 +211,15 @@ func KernelVersion() (string, error) {
} }
func KernelVersionWithContext(ctx context.Context) (string, error) { func KernelVersionWithContext(ctx context.Context) (string, error) {
_, _, version, err := PlatformInformation() uname, err := exec.LookPath("uname")
if err != nil {
return "", err
}
out, err := invoke.CommandWithContext(ctx, uname, "-r")
if err != nil {
return "", err
}
version := strings.ToLower(strings.TrimSpace(string(out)))
return version, err return version, err
} }

Loading…
Cancel
Save