Skip to content

Commit 3b056f9

Browse files
committed
internal/version: Update UserAgent logic for osarch change
Signed-off-by: Stéphane Graber <[email protected]>
1 parent 5d7da7b commit 3b056f9

File tree

1 file changed

+7
-19
lines changed

1 file changed

+7
-19
lines changed

internal/version/platform_linux.go

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,42 +3,30 @@
33
package version
44

55
import (
6-
"os"
76
"strings"
87

98
"github.com/lxc/incus/v6/internal/linux"
109
"github.com/lxc/incus/v6/shared/osarch"
11-
"github.com/lxc/incus/v6/shared/util"
1210
)
1311

1412
func getPlatformVersionStrings() []string {
1513
versions := []string{}
1614

17-
// Add kernel version
15+
// Add kernel version.
1816
uname, err := linux.Uname()
1917
if err != nil {
2018
return versions
2119
}
2220

2321
versions = append(versions, strings.Split(uname.Release, "-")[0])
2422

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"])
3527

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"])
4230
}
4331
}
4432

0 commit comments

Comments
 (0)