Skip to content

fix: chassis can have multiple entries in smbios #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 12, 2025
Merged

fix: chassis can have multiple entries in smbios #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@ import (
"encoding/json"
"flag"
"fmt"
"github.com/numtide/nixos-facter/pkg/udev"
"log"
"log/slog"
"os"
"strings"

"github.com/numtide/nixos-facter/pkg/udev"

"github.com/numtide/nixos-facter/pkg/build"
"github.com/numtide/nixos-facter/pkg/facter"
"github.com/numtide/nixos-facter/pkg/hwinfo"
Expand Down
12 changes: 3 additions & 9 deletions pkg/facter/smbios.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ type Smbios struct {
Cache []hwinfo.Smbios `json:"cache,omitempty"`

// Chassis holds information related to the system's chassis, including manufacturer, version, and lock presence.
Chassis *hwinfo.SmbiosChassis `json:"chassis,omitempty"`
Chassis []hwinfo.Smbios `json:"chassis,omitempty"`

// Config captures system configuration options.
Config *hwinfo.SmbiosConfig `json:"config,omitempty"`
Expand Down Expand Up @@ -97,14 +97,6 @@ func (s *Smbios) add(item hwinfo.Smbios) error {
}
case hwinfo.SmbiosTypeCache:
s.Cache = append(s.Cache, item)
case hwinfo.SmbiosTypeChassis:
if s.Chassis != nil {
return errors.New("chassis field is already set")
} else if chassis, ok := item.(*hwinfo.SmbiosChassis); !ok {
return fmt.Errorf("expected hwinfo.SmbiosChassis, found %T", item)
} else {
s.Chassis = chassis
}
case hwinfo.SmbiosTypeConfig:
if s.Config != nil {
return errors.New("config field is already set")
Expand All @@ -113,6 +105,8 @@ func (s *Smbios) add(item hwinfo.Smbios) error {
} else {
s.Config = config
}
case hwinfo.SmbiosTypeChassis:
s.Chassis = append(s.Chassis, item)
case hwinfo.SmbiosTypeGroupAssociations:
s.GroupAssociations = append(s.GroupAssociations, item)
case hwinfo.SmbiosTypeHardwareSecurity:
Expand Down