Merge pull request #182 from nix-community/feat/make-drivers-ephemeral

feat: make more items ephemeral

Author: Mic92

pkg/facter/facter.go

@@ -73,7 +73,7 @@ func (s *Scanner) Scan() (*Report, error) {
 
 	slog.Info("scanning hardware", "features", s.Features)
 
-	smbios, devices, err = hwinfo.Scan(s.Features)
+	smbios, devices, err = hwinfo.Scan(s.Features, s.Ephemeral)
 	if err != nil {
 		return nil, fmt.Errorf("failed to scan hardware: %w", err)
 	}

pkg/hwinfo/hardware.go

@@ -11,6 +11,7 @@ import (
 	"errors"
 	"fmt"
 	"slices"
+	"strings"
 )
 
 // ProbeFeature is a type that specifies various hardware probing features.
@@ -546,7 +547,7 @@ type HardwareDevice struct {
 	Label string `json:"label,omitempty"`
 }
 
-func NewHardwareDevice(hd *C.hd_t) (*HardwareDevice, error) {
+func NewHardwareDevice(hd *C.hd_t, ephemeral bool) (*HardwareDevice, error) {
 	if hd == nil {
 		return nil, errors.New("hd is nil")
 	}
@@ -632,6 +633,13 @@ func NewHardwareDevice(hd *C.hd_t) (*HardwareDevice, error) {
 		Label:             C.GoString(hd.label),
 	}
 
+	if !ephemeral {
+		// /dev/disk/by-diskseq is not stable, so we remove them
+		result.UnixDeviceNames = slices.DeleteFunc(result.UnixDeviceNames, func(name string) bool {
+			return strings.HasPrefix(name, "/dev/disk/by-diskseq/")
+		})
+	}
+
 	// only set the slot information if the bus type has been set
 	if result.BusType != nil {
 		slot := Slot(hd.slot)

pkg/hwinfo/hwinfo.go

@@ -31,7 +31,7 @@ func excludeDevice(item *HardwareDevice) bool {
 }
 
 // Scan returns a list of SMBIOS entries and detected hardware devices based on the provided probe features.
-func Scan(probes []ProbeFeature) ([]Smbios, []HardwareDevice, error) {
+func Scan(probes []ProbeFeature, ephemeral bool) ([]Smbios, []HardwareDevice, error) {
 	// initialise the struct to hold scan data
 	data := (*C.hd_data_t)(C.calloc(1, C.size_t(unsafe.Sizeof(C.hd_data_t{}))))
 
@@ -62,7 +62,7 @@ func Scan(probes []ProbeFeature) ([]Smbios, []HardwareDevice, error) {
 	var hardwareItems []HardwareDevice
 	var deviceIdx uint
 	for hd := data.hd; hd != nil; hd = hd.next {
-		item, err := NewHardwareDevice(hd)
+		item, err := NewHardwareDevice(hd, ephemeral)
 		if err != nil {
 			return nil, nil, err
 		}