Merge pull request #884 from sacsant/mapper

cgwalters · web-flow · commit 34b490fce7b2 · 2024-11-08T06:53:28.000-05:00
lib/blockdev: Handle devicemapper path
diff --git a/lib/src/blockdev.rs b/lib/src/blockdev.rs
@@ -37,13 +37,14 @@ pub(crate) struct Device {
     // Filesystem-related properties
     pub(crate) label: Option<String>,
     pub(crate) fstype: Option<String>,
+    pub(crate) path: Option<String>,
 }
 
 impl Device {
     #[allow(dead_code)]
     // RHEL8's lsblk doesn't have PATH, so we do it
     pub(crate) fn path(&self) -> String {
-        format!("/dev/{}", &self.name)
+        self.path.clone().unwrap_or(format!("/dev/{}", &self.name))
     }
 
     pub(crate) fn has_children(&self) -> bool {

Original file line number	Diff line number	Diff line change
`@@ -37,13 +37,14 @@ pub(crate) struct Device {`
`37`	`37`	`// Filesystem-related properties`
`38`	`38`	`pub(crate) label: Option<String>,`
`39`	`39`	`pub(crate) fstype: Option<String>,`
	`40`	`+ pub(crate) path: Option<String>,`
`40`	`41`	`}`
`41`	`42`
`42`	`43`	`impl Device {`
`43`	`44`	`#[allow(dead_code)]`
`44`	`45`	`// RHEL8's lsblk doesn't have PATH, so we do it`
`45`	`46`	`pub(crate) fn path(&self) -> String {`
`46`		`- format!("/dev/{}", &self.name)`
	`47`	`+ self.path.clone().unwrap_or(format!("/dev/{}", &self.name))`
`47`	`48`	`}`
`48`	`49`
`49`	`50`	`pub(crate) fn has_children(&self) -> bool {`