OrgGo
/
shirou_gopsutil
mirror of https://hub.fastgit.org/shirou/gopsutil.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1324 from yyt030/master 

add neokylin host info on linux
This commit is contained in:
shirou 2022-07-14 22:33:00 +09:00 committed by GitHub
parent 96fd417faa 15354cbdee
commit 8c479f5153
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
host/host_linux.go
View File

@ -216,6 +216,12 @@ func PlatformInformationWithContext(ctx context.Context) (platform string, famil
version = contents[0]
}
}
} else if common.PathExists(common.HostEtc("neokylin-release")) {
contents, err := common.ReadLines(common.HostEtc("neokylin-release"))
if err == nil {
version = getRedhatishVersion(contents)
platform = getRedhatishPlatform(contents)
}
} else if common.PathExists(common.HostEtc("redhat-release")) {
contents, err := common.ReadLines(common.HostEtc("redhat-release"))
if err == nil {
@ -296,6 +302,8 @@ func PlatformInformationWithContext(ctx context.Context) (platform string, famil
family = "coreos"
case "solus":
family = "solus"
case "neokylin":
family = "neokylin"
}
return platform, family, version, nil
@ -322,7 +330,7 @@ func getRedhatishVersion(contents []string) string {
if strings.Contains(c, "rawhide") {
return "rawhide"
}
if matches := regexp.MustCompile(`release (\d[\d.]*)`).FindStringSubmatch(c); matches != nil {
if matches := regexp.MustCompile(`release (\w[\d.]*)`).FindStringSubmatch(c); matches != nil {
return matches[1]
}
return ""