Merge pull request #1813 from stgraber/osarch

Extend OS detection logic

Author: hallyn

cmd/incus-agent/state.go

@@ -250,10 +250,10 @@ func osState() *api.InstanceStateOSInfo {
 	osInfo := &api.InstanceStateOSInfo{}
 
 	// Get information about the OS.
-	lsbRelease, err := osarch.GetLSBRelease()
+	lsbRelease, err := osarch.GetOSRelease()
 	if err == nil {
 		osInfo.OS = lsbRelease["NAME"]
-		osInfo.OSVersion = lsbRelease["VERSION"]
+		osInfo.OSVersion = lsbRelease["VERSION_ID"]
 	}
 
 	// Get information about the kernel version.

internal/server/sys/os.go

@@ -178,7 +178,7 @@ func (s *OS) Init() ([]cluster.Warning, error) {
 	s.CGInfo = cgroup.GetInfo()
 
 	// Fill in the OS release info.
-	osInfo, err := osarch.GetLSBRelease()
+	osInfo, err := osarch.GetOSRelease()
 	if err != nil {
 		return nil, err
 	}

internal/version/platform_linux.go

@@ -3,42 +3,30 @@
 package version
 
 import (
-	"os"
 	"strings"
 
 	"github.com/lxc/incus/v6/internal/linux"
 	"github.com/lxc/incus/v6/shared/osarch"
-	"github.com/lxc/incus/v6/shared/util"
 )
 
 func getPlatformVersionStrings() []string {
 	versions := []string{}
 
-	// Add kernel version
+	// Add kernel version.
 	uname, err := linux.Uname()
 	if err != nil {
 		return versions
 	}
 
 	versions = append(versions, strings.Split(uname.Release, "-")[0])
 
-	// Add distribution info
-	lsbRelease, err := osarch.GetLSBRelease()
-	if err == nil {
-		for _, key := range []string{"NAME", "VERSION_ID"} {
-			value, ok := lsbRelease[key]
-			if ok {
-				versions = append(versions, value)
-			}
-		}
-	}
+	// Add distribution info.
+	osRelease, err := osarch.GetOSRelease()
+	if err == nil && osRelease["NAME"] != "" {
+		versions = append(versions, osRelease["NAME"])
 
-	// Add chromebook info
-	if len(versions) == 1 && util.PathExists("/run/cros_milestone") {
-		content, err := os.ReadFile("/run/cros_milestone")
-		if err == nil {
-			versions = append(versions, "Chrome OS")
-			versions = append(versions, strings.TrimSpace(string(content)))
+		if osRelease["VERSION_ID"] != "" {
+			versions = append(versions, osRelease["VERSION_ID"])
 		}
 	}
 

shared/osarch/release.go

@@ -6,19 +6,65 @@ import (
 	"io/fs"
 	"os"
 	"strings"
+
+	"github.com/lxc/incus/v6/shared/util"
 )
 
-// GetLSBRelease returns a map with Linux distribution information.
-func GetLSBRelease() (map[string]string, error) {
-	osRelease, err := getLSBRelease("/etc/os-release")
-	if errors.Is(err, fs.ErrNotExist) {
-		return getLSBRelease("/usr/lib/os-release")
+// GetOSRelease returns a map with Linux distribution information.
+func GetOSRelease() (map[string]string, error) {
+	// Handle TrueNAS.
+	if util.PathExists("/usr/share/truenas") {
+		content, err := os.ReadFile("/etc/version")
+		if err == nil {
+			return map[string]string{
+				"NAME":       "TrueNAS Scale",
+				"VERSION_ID": strings.TrimSpace(string(content)),
+			}, nil
+		}
+	}
+
+	// Add chromebook info
+	if util.PathExists("/run/cros_milestone") {
+		content, err := os.ReadFile("/run/cros_milestone")
+		if err == nil {
+			return map[string]string{
+				"NAME":       "Chrome OS",
+				"VERSION_ID": strings.TrimSpace(string(content)),
+			}, nil
+		}
+	}
+
+	// Parse OS release files.
+	for _, osPath := range []string{"/etc/os-release", "/usr/lib/os-release"} {
+		osRelease, err := getOSRelease(osPath)
+		if err != nil {
+			if errors.Is(err, fs.ErrNotExist) {
+				continue
+			}
+
+			return nil, err
+		}
+
+		// Check if we have what we need.
+		if osRelease["IMAGE_ID"] != "" {
+			return map[string]string{
+				"NAME":       osRelease["IMAGE_ID"],
+				"VERSION_ID": osRelease["IMAGE_VERSION"],
+			}, nil
+		}
+
+		if osRelease["NAME"] != "" {
+			return map[string]string{
+				"NAME":       osRelease["NAME"],
+				"VERSION_ID": osRelease["VERSION_ID"],
+			}, nil
+		}
 	}
 
-	return osRelease, err
+	return map[string]string{}, nil
 }
 
-func getLSBRelease(filename string) (map[string]string, error) {
+func getOSRelease(filename string) (map[string]string, error) {
 	osRelease := make(map[string]string)
 
 	data, err := os.ReadFile(filename)

shared/osarch/release_test.go

@@ -15,15 +15,15 @@ func TestReleaseTestSuite(t *testing.T) {
 	suite.Run(t, new(releaseTestSuite))
 }
 
-func (s *releaseTestSuite) TestGetLSBRelease() {
+func (s *releaseTestSuite) TestGetOSRelease() {
 	content := `NAME="Ubuntu"
 ID="ubuntu"
 VERSION_ID="16.04"
 `
 	filename, cleanup := WriteTempFile(&s.Suite, "", "os-release", content)
 	defer cleanup()
 
-	lsbRelease, err := getLSBRelease(filename)
+	lsbRelease, err := getOSRelease(filename)
 	s.Nil(err)
 	s.Equal(
 		map[string]string{
@@ -33,27 +33,27 @@ VERSION_ID="16.04"
 		}, lsbRelease)
 }
 
-func (s *releaseTestSuite) TestGetLSBReleaseSingleQuotes() {
+func (s *releaseTestSuite) TestGetOSReleaseSingleQuotes() {
 	content := `NAME='Ubuntu'`
 	filename, cleanup := WriteTempFile(&s.Suite, "", "os-release", content)
 	defer cleanup()
 
-	lsbRelease, err := getLSBRelease(filename)
+	lsbRelease, err := getOSRelease(filename)
 	s.Nil(err)
 	s.Equal(map[string]string{"NAME": "Ubuntu"}, lsbRelease)
 }
 
-func (s *releaseTestSuite) TestGetLSBReleaseNoQuotes() {
+func (s *releaseTestSuite) TestGetOSReleaseNoQuotes() {
 	content := `NAME=Ubuntu`
 	filename, cleanup := WriteTempFile(&s.Suite, "", "os-release", content)
 	defer cleanup()
 
-	lsbRelease, err := getLSBRelease(filename)
+	lsbRelease, err := getOSRelease(filename)
 	s.Nil(err)
 	s.Equal(map[string]string{"NAME": "Ubuntu"}, lsbRelease)
 }
 
-func (s *releaseTestSuite) TestGetLSBReleaseSkipCommentsEmpty() {
+func (s *releaseTestSuite) TestGetOSReleaseSkipCommentsEmpty() {
 	content := `
 NAME="Ubuntu"
 
@@ -64,7 +64,7 @@ VERSION_ID="16.04"
 	filename, cleanup := WriteTempFile(&s.Suite, "", "os-release", content)
 	defer cleanup()
 
-	lsbRelease, err := getLSBRelease(filename)
+	lsbRelease, err := getOSRelease(filename)
 	s.Nil(err)
 	s.Equal(
 		map[string]string{
@@ -74,7 +74,7 @@ VERSION_ID="16.04"
 		}, lsbRelease)
 }
 
-func (s *releaseTestSuite) TestGetLSBReleaseInvalidLine() {
+func (s *releaseTestSuite) TestGetOSReleaseInvalidLine() {
 	content := `
 NAME="Ubuntu"
 this is invalid
@@ -83,6 +83,6 @@ ID="ubuntu"
 	filename, cleanup := WriteTempFile(&s.Suite, "", "os-release", content)
 	defer cleanup()
 
-	_, err := getLSBRelease(filename)
+	_, err := getOSRelease(filename)
 	s.EqualError(err, fmt.Sprintf("%s: invalid format on line 3", filename))
 }