Properly detect dm devices

Fixes: jaypipes#298
avishayt · Jan 31, 2022 · 1a26844 · 1a26844
1 parent 4d0ed8f
commit 1a26844
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/pkg/block/block.go b/pkg/block/block.go
@@ -29,6 +29,7 @@ const (
 	DRIVE_TYPE_FDD               // Floppy disk drive
 	DRIVE_TYPE_ODD               // Optical disk drive
 	DRIVE_TYPE_SSD               // Solid-state drive
+	DRIVE_TYPE_MAPPER            // Mapper device
 )
 
 var (
@@ -38,6 +39,7 @@ var (
 		DRIVE_TYPE_FDD:     "FDD",
 		DRIVE_TYPE_ODD:     "ODD",
 		DRIVE_TYPE_SSD:     "SSD",
+		DRIVE_TYPE_MAPPER:  "Mapper",
 	}
 
 	// NOTE(fromani): the keys are all lowercase and do not match
@@ -51,6 +53,7 @@ var (
 		"fdd":     DRIVE_TYPE_FDD,
 		"odd":     DRIVE_TYPE_ODD,
 		"ssd":     DRIVE_TYPE_SSD,
+		"mapper":  DRIVE_TYPE_MAPPER,
 	}
 )
 
@@ -163,6 +166,7 @@ type Disk struct {
 	SerialNumber string       `json:"serial_number"`
 	WWN          string       `json:"wwn"`
 	Partitions   []*Partition `json:"partitions"`
+	Members      []string     `json:"members"`
 	// TODO(jaypipes): Add PCI field for accessing PCI device information
 	// PCI *PCIDevice `json:"pci"`
 }

diff --git a/pkg/block/block_linux.go b/pkg/block/block_linux.go
@@ -252,6 +252,20 @@ func diskIsRemovable(paths *linuxpath.Paths, disk string) bool {
 	return removable == "1"
 }
 
+func diskMembers(ctx *context.Context, paths *linuxpath.Paths, disk string) []string {
+	out := make([]string, 0)
+	path := filepath.Join(paths.SysBlock, disk, "slaves")
+	files, err := ioutil.ReadDir(path)
+	if err != nil {
+		ctx.Warn("failed to read slaves: %s\n", err)
+		return out
+	}
+	for _, file := range files {
+		out = append(out, file.Name())
+	}
+	return out
+}
+
 func disks(ctx *context.Context, paths *linuxpath.Paths) []*Disk {
 	// In Linux, we could use the fdisk, lshw or blockdev commands to list disk
 	// information, however all of these utilities require root privileges to
@@ -283,6 +297,7 @@ func disks(ctx *context.Context, paths *linuxpath.Paths) []*Disk {
 		serialNo := diskSerialNumber(paths, dname)
 		wwn := diskWWN(paths, dname)
 		removable := diskIsRemovable(paths, dname)
+		members := diskMembers(ctx, paths, dname)
 
 		d := &Disk{
 			Name:                   dname,
@@ -297,6 +312,7 @@ func disks(ctx *context.Context, paths *linuxpath.Paths) []*Disk {
 			Model:                  model,
 			SerialNumber:           serialNo,
 			WWN:                    wwn,
+			Members:                members,
 		}
 
 		parts := diskPartitions(ctx, paths, dname)
@@ -345,6 +361,8 @@ func diskTypes(dname string) (
 	} else if strings.HasPrefix(dname, "mmc") {
 		driveType = DRIVE_TYPE_SSD
 		storageController = STORAGE_CONTROLLER_MMC
+	} else if strings.HasPrefix(dname, "dm-") {
+		driveType = DRIVE_TYPE_MAPPER
 	}
 
 	return driveType, storageController