efi.rs: fix blockdev import

Author: yasminvalim

src/efi.rs

@@ -32,7 +32,7 @@ use crate::freezethaw::fsfreeze_thaw_cycle;
 use crate::model::*;
 use crate::ostreeutil;
 use crate::util;
-use crate::{blockdev, filetree, grubconfigs};
+use crate::{filetree, grubconfigs};
 use crate::{component::*, packagesystem::*};
 
 /// Well-known paths to the ESP that may have been mounted external to us.
@@ -241,7 +241,7 @@ impl Efi {
         log::debug!("Get product name: '{product_name}'");
         assert!(product_name.len() > 0);
 
-        let esp_part_num = blockdev::get_esp_partition_number(device)?;
+        let esp_part_num = crate::blockdev::get_esp_partition_number(device)?;
 
         // clear all the boot entries that match the target name
         clear_efi_target(&product_name)?;
@@ -334,8 +334,8 @@ impl Efi {
         let esp_path = if let Some(mounted_esp) = self.get_mounted_esp(sysroot)? {
             mounted_esp
         } else {
-            let devices = blockdev::get_devices(sysroot)?;
-            let Some(esp_devices) = blockdev::find_colocated_esps(&devices)? else {
+            let devices = crate::blockdev::get_devices(sysroot)?;
+            let Some(esp_devices) = crate::blockdev::find_colocated_esps(&devices)? else {
                 anyhow::bail!("No ESP found");
             };
             // find_colocated_esps returns Some only with a non-empty vec
@@ -490,7 +490,7 @@ impl Component for Efi {
         updatemeta: &ContentMetadata,
         with_static_config: bool,
     ) -> Result<Option<InstalledContent>> {
-        let esp_devices = blockdev::find_colocated_esps(&rootcxt.devices)?;
+        let esp_devices = crate::blockdev::find_colocated_esps(&rootcxt.devices)?;
         let Some(meta) = self.query_adopt(&esp_devices)? else {
             return Ok(None);
         };
@@ -572,7 +572,7 @@ impl Component for Efi {
             if device.is_empty() {
                 anyhow::bail!("Device value not provided");
             }
-            let esp_device = blockdev::get_esp_partition(device)?
+            let esp_device = crate::blockdev::get_esp_partition(device)?
                 .ok_or_else(|| anyhow::anyhow!("Failed to find ESP device"))?;
             self.mount_esp_device(Path::new(dest_root), Path::new(&esp_device))?
         };
@@ -646,7 +646,7 @@ impl Component for Efi {
         let updatef = filetree::FileTree::new_from_dir(&updated).context("reading update dir")?;
         let diff = currentf.diff(&updatef)?;
 
-        let Some(esp_devices) = blockdev::find_colocated_esps(&rootcxt.devices)? else {
+        let Some(esp_devices) = crate::blockdev::find_colocated_esps(&rootcxt.devices)? else {
             anyhow::bail!("Failed to find all esp devices");
         };
 
@@ -730,7 +730,7 @@ impl Component for Efi {
 
     fn validate(&self, current: &InstalledContent) -> Result<ValidationResult> {
         let devices = crate::blockdev::get_devices("/").context("get parent devices")?;
-        let esp_devices = blockdev::find_colocated_esps(&devices)?;
+        let esp_devices = crate::blockdev::find_colocated_esps(&devices)?;
         if !is_efi_booted()? && esp_devices.is_none() {
             return Ok(ValidationResult::Skip);
         }