fix: read device serial like in v1

Restore previous behavior. I couldn't find any meaningful device which provides serial this way today, except for probably USB devices. See siderolabs/talos#9951 Signed-off-by: Andrey Smirnov <[email protected]>
siderolabs · Dec 17, 2024 · 57e15ed · 57e15ed
1 parent 8853e37
commit 57e15ed
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/block/device_linux.go b/block/device_linux.go
@@ -341,7 +341,7 @@ func (d *Device) GetProperties() (*DeviceProperties, error) {
 
 	props := &DeviceProperties{
 		Model:    readSysFsFile(filepath.Join(sysFsPath, "device", "model")),
-		Serial:   readSysFsFile(filepath.Join(sysFsPath, "device", "serial")),
+		Serial:   readSysFsFile(filepath.Join(sysFsPath, "serial")),
 		Modalias: readSysFsFile(filepath.Join(sysFsPath, "device", "modalias")),
 		WWID:     readSysFsFile(filepath.Join(sysFsPath, "wwid")),
 	}
@@ -350,6 +350,10 @@ func (d *Device) GetProperties() (*DeviceProperties, error) {
 		props.WWID = readSysFsFile(filepath.Join(sysFsPath, "device", "wwid"))
 	}
 
+	if props.Serial == "" {
+		props.Serial = readSysFsFile(filepath.Join(sysFsPath, "device", "serial"))
+	}
+
 	fullPath, err := os.Readlink(sysFsPath)
 	if err == nil {
 		props.BusPath = filepath.Dir(filepath.Dir(strings.TrimPrefix(fullPath, "../../devices")))