blockdev: update get_devices() to get_parent_devices()

Author: HuijingHei

src/bios.rs

@@ -98,7 +98,7 @@ impl Bios {
 
     // check bios_boot partition on gpt type disk
     fn get_bios_boot_partition(&self) -> Option<String> {
-        match blockdev::get_single_device("/") {
+        match blockdev::get_single_device() {
             Ok(device) => {
                 let bios_boot_part =
                     blockdev::get_bios_boot_partition(&device).expect("get bios_boot part");
@@ -162,7 +162,7 @@ impl Component for Bios {
         };
 
         let target_root = "/";
-        let device = blockdev::get_single_device(&target_root)?;
+        let device = blockdev::get_single_device()?;
         self.run_grub_install(target_root, &device)?;
         log::debug!("Install grub modules on {device}");
         Ok(InstalledContent {
@@ -180,7 +180,7 @@ impl Component for Bios {
         let updatemeta = self.query_update(sysroot)?.expect("update available");
         let dest_fd = format!("/proc/self/fd/{}", sysroot.as_raw_fd());
         let dest_root = std::fs::read_link(dest_fd)?;
-        let device = blockdev::get_single_device(&dest_root)?;
+        let device = blockdev::get_single_device()?;
 
         let dest_root = dest_root.to_string_lossy().into_owned();
         self.run_grub_install(&dest_root, &device)?;

src/blockdev.rs

@@ -30,16 +30,16 @@ pub fn get_devices<P: AsRef<Path>>(target_root: P) -> Result<Vec<String>> {
 }
 
 // Get single device for the target root
-pub fn get_single_device<P: AsRef<Path>>(target_root: P) -> Result<String> {
-    let mut devices = get_devices(&target_root)?.into_iter();
+pub fn get_single_device() -> Result<String> {
+    let mut devices = get_parent_devices(None).iter();
     let Some(parent) = devices.next() else {
         anyhow::bail!("Failed to find parent device");
     };
 
     if let Some(next) = devices.next() {
         anyhow::bail!("Found multiple parent devices {parent} and {next}; not currently supported");
     }
-    Ok(parent)
+    Ok(parent.to_string())
 }
 
 /// Find esp partition on the same device
@@ -58,11 +58,11 @@ pub fn get_esp_partition(device: &str) -> Result<Option<String>> {
     Ok(None)
 }
 
-/// Find all ESP partitions on the devices with mountpoint boot
+/// Find all ESP partitions on the devices
 #[allow(dead_code)]
-pub fn find_colocated_esps<P: AsRef<Path>>(target_root: P) -> Result<Vec<String>> {
+pub fn find_colocated_esps() -> Result<Vec<String>> {
     // first, get the parent device
-    let devices = get_devices(&target_root).with_context(|| "while looking for colocated ESPs")?;
+    let devices = get_parent_devices(None);
 
     // now, look for all ESPs on those devices
     let mut esps = Vec::new();
@@ -89,12 +89,11 @@ pub fn get_bios_boot_partition(device: &str) -> Result<Option<String>> {
     Ok(None)
 }
 
-/// Find all bios_boot partitions on the devices with mountpoint boot
+/// Find all bios_boot partitions on the devices
 #[allow(dead_code)]
-pub fn find_colocated_bios_boot<P: AsRef<Path>>(target_root: P) -> Result<Vec<String>> {
+pub fn find_colocated_bios_boot() -> Result<Vec<String>> {
     // first, get the parent device
-    let devices =
-        get_devices(&target_root).with_context(|| "looking for colocated bios_boot parts")?;
+    let devices = get_parent_devices(None);
 
     // now, look for all bios_boot parts on those devices
     let mut bios_boots = Vec::new();