未验证 提交 8c479f51 编写于 作者: S shirou 提交者: GitHub

Merge pull request #1324 from yyt030/master

add neokylin host info on linux
......@@ -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 ""
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册