|
3 | 3 | package version
|
4 | 4 |
|
5 | 5 | import (
|
6 |
| - "os" |
7 | 6 | "strings"
|
8 | 7 |
|
9 | 8 | "github.com/lxc/incus/v6/internal/linux"
|
10 | 9 | "github.com/lxc/incus/v6/shared/osarch"
|
11 |
| - "github.com/lxc/incus/v6/shared/util" |
12 | 10 | )
|
13 | 11 |
|
14 | 12 | func getPlatformVersionStrings() []string {
|
15 | 13 | versions := []string{}
|
16 | 14 |
|
17 |
| - // Add kernel version |
| 15 | + // Add kernel version. |
18 | 16 | uname, err := linux.Uname()
|
19 | 17 | if err != nil {
|
20 | 18 | return versions
|
21 | 19 | }
|
22 | 20 |
|
23 | 21 | versions = append(versions, strings.Split(uname.Release, "-")[0])
|
24 | 22 |
|
25 |
| - // Add distribution info |
26 |
| - lsbRelease, err := osarch.GetLSBRelease() |
27 |
| - if err == nil { |
28 |
| - for _, key := range []string{"NAME", "VERSION_ID"} { |
29 |
| - value, ok := lsbRelease[key] |
30 |
| - if ok { |
31 |
| - versions = append(versions, value) |
32 |
| - } |
33 |
| - } |
34 |
| - } |
| 23 | + // Add distribution info. |
| 24 | + osRelease, err := osarch.GetOSRelease() |
| 25 | + if err == nil && osRelease["NAME"] != "" { |
| 26 | + versions = append(versions, osRelease["NAME"]) |
35 | 27 |
|
36 |
| - // Add chromebook info |
37 |
| - if len(versions) == 1 && util.PathExists("/run/cros_milestone") { |
38 |
| - content, err := os.ReadFile("/run/cros_milestone") |
39 |
| - if err == nil { |
40 |
| - versions = append(versions, "Chrome OS") |
41 |
| - versions = append(versions, strings.TrimSpace(string(content))) |
| 28 | + if osRelease["VERSION_ID"] != "" { |
| 29 | + versions = append(versions, osRelease["VERSION_ID"]) |
42 | 30 | }
|
43 | 31 | }
|
44 | 32 |
|
|
0 commit comments