Merge pull request #3522 from clwluvw/hidden-device

iwankgb · web-flow · commit 96c346ed6af3 · 2024-10-04T21:58:56.000+02:00
sysfs: trim spaces in device hidden check
diff --git a/utils/sysfs/sysfs.go b/utils/sysfs/sysfs.go
@@ -254,10 +254,8 @@ func (fs *realSysFs) IsBlockDeviceHidden(name string) (bool, error) {
 	if err != nil {
 		return false, fmt.Errorf("failed to read %s: %w", devHiddenPath, err)
 	}
-	if string(hidden) == "1" {
-		return true, nil
-	}
-	return false, nil
+
+	return strings.TrimSpace(string(hidden)) == "1", nil
 }
 
 func (fs *realSysFs) GetBlockDeviceScheduler(name string) (string, error) {

Original file line number	Diff line number	Diff line change
`@@ -254,10 +254,8 @@ func (fs *realSysFs) IsBlockDeviceHidden(name string) (bool, error) {`
`254`	`254`	`if err != nil {`
`255`	`255`	`return false, fmt.Errorf("failed to read %s: %w", devHiddenPath, err)`
`256`	`256`	`}`
`257`		`- if string(hidden) == "1" {`
`258`		`- return true, nil`
`259`		`- }`
`260`		`- return false, nil`
	`257`	`+`
	`258`	`+ return strings.TrimSpace(string(hidden)) == "1", nil`
`261`	`259`	`}`
`262`	`260`
`263`	`261`	`func (fs *realSysFs) GetBlockDeviceScheduler(name string) (string, error) {`