disks: Fix paths

Signed-off-by: Ikey Doherty <[email protected]>

Author: ikeycode

crates/disks/src/disk.rs

@@ -9,7 +9,8 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use crate::{mmc, mock, nvme, partition::Partition, scsi, sysfs, virt, DEVFS_DIR};
+use crate::SYSFS_DIR;
+use crate::{mmc, mock, nvme, partition::Partition, scsi, sysfs, virt};
 
 /// Represents the type of disk device.
 #[derive(Debug)]
@@ -144,7 +145,7 @@ pub trait DiskInit: Sized {
 
 impl DiskInit for BasicDisk {
     fn from_sysfs_path(sysroot: &Path, name: &str) -> Option<Self> {
-        let node = sysroot.join(name);
+        let node = sysroot.join(SYSFS_DIR).join(name);
 
         log::debug!("Initializing disk at sysfs path: {:?}", node);
 
@@ -162,7 +163,7 @@ impl DiskInit for BasicDisk {
         let sectors = sysfs::read(&node, "size").unwrap_or(0);
         log::debug!("Read {} sectors for disk {}", sectors, name);
 
-        let device = PathBuf::from(DEVFS_DIR).join(name);
+        let device = PathBuf::from("/dev").join(name);
         log::debug!("Device path: {:?}", device);
 
         let model = sysfs::read(&node, "device/model");

crates/disks/src/lib.rs

@@ -139,7 +139,7 @@ impl BlockDevice {
         // For all the discovered block devices, try to create a Disk instance
         // At this point we completely ignore partitions. They come later.
         for entry in entries {
-            if let Ok(device) = BlockDevice::from_sysfs_path(&sysfs_dir, &entry) {
+            if let Ok(device) = BlockDevice::from_sysfs_path(sysroot, &entry) {
                 devices.push(device);
             }
         }

crates/disks/src/loopback.rs

@@ -42,7 +42,7 @@ impl Device {
     /// * `None` if the name doesn't match or the device can't be initialized
     pub fn from_sysfs_path(sysroot: &Path, name: &str) -> Option<Self> {
         let matching = name.starts_with("loop") && name[4..].chars().all(char::is_numeric);
-        let node = sysroot.join(name);
+        let node = sysroot.join(SYSFS_DIR).join(name);
         let file = sysfs::read::<PathBuf>(&node, "loop/backing_file");
         let disk = file.as_ref().and_then(|_| BasicDisk::from_sysfs_path(sysroot, name));
         if matching {
@@ -60,7 +60,7 @@ impl Device {
     /// Creates a new Device instance from a device path.
     pub fn from_device_path(device: &Path) -> Option<Self> {
         let name = device.file_name()?.to_string_lossy().to_string();
-        Self::from_sysfs_path(&PathBuf::from("/").join(SYSFS_DIR), &name)
+        Self::from_sysfs_path(&PathBuf::from("/"), &name)
     }
 
     /// Returns the device name.

crates/disks/src/partition.rs

@@ -5,7 +5,7 @@
 use std::fmt;
 use std::path::{Path, PathBuf};
 
-use crate::{sysfs, DEVFS_DIR};
+use crate::{sysfs, DEVFS_DIR, SYSFS_DIR};
 
 /// Represents a partition on a disk device
 /// - Size in sectors
@@ -49,7 +49,7 @@ impl Partition {
     /// * `Some(Partition)` if partition exists and is valid
     /// * `None` if partition doesn't exist or is invalid
     pub fn from_sysfs_path(sysroot: &Path, name: &str) -> Option<Self> {
-        let node = sysroot.join(name);
+        let node = sysroot.join(SYSFS_DIR).join(name);
         let partition_no: u32 = sysfs::read(&node, "partition")?;
         let start = sysfs::read(&node, "start")?;
         let size = sysfs::read(&node, "size")?;