fix: lint issues

Author: yasminvalim

src/bootupd.rs

@@ -692,9 +692,9 @@ pub(crate) fn copy_to_boot() -> Result<()> {
     }
 
     for component in all_components.values() {
-        component.package_mode_copy_to_boot().with_context(|| {
-            format!("Failed to copy component {} to boot", component.name())
-        })?;
+        component
+            .package_mode_copy_to_boot()
+            .with_context(|| format!("Failed to copy component {} to boot", component.name()))?;
     }
 
     Ok(())

src/efi.rs

@@ -187,8 +187,8 @@ impl Efi {
     /// Package mode copy: Simple copy from /usr/lib/efi to boot/ESP.
     fn package_mode_copy_to_boot_impl(&self) -> Result<()> {
         let sysroot = Path::new("/");
-        let sysroot_path = Utf8Path::from_path(sysroot)
-            .context("Sysroot path is not valid UTF-8")?;
+        let sysroot_path =
+            Utf8Path::from_path(sysroot).context("Sysroot path is not valid UTF-8")?;
 
         // Find components in /usr/lib/efi
         let efi_comps = match get_efi_component_from_usr(sysroot_path, EFILIB)? {
@@ -199,53 +199,55 @@ impl Efi {
             }
         };
 
-        // Find the ESP
-        let esp_path = match self.get_mounted_esp(sysroot)? {
-            Some(path) => path,
-            None => {
-                let devices = blockdev::get_devices(sysroot)?;
-                let esp_devices = blockdev::find_colocated_esps(&devices)?;
-                let Some(esp_devices) = esp_devices else {
-                    anyhow::bail!("No ESP found");
-                };
-                let esp_device = esp_devices
-                    .first()
-                    .context("No ESP devices found")?;
-                self.ensure_mounted_esp(sysroot, Path::new(esp_device))?
-            }
+        // Find all ESP devices
+        let devices = blockdev::get_devices(sysroot)?;
+        let Some(esp_devices) = blockdev::find_colocated_esps(&devices)? else {
+            anyhow::bail!("No ESP found");
         };
 
-        let esp_dir = openat::Dir::open(&esp_path)
-            .with_context(|| format!("Opening ESP at {}", esp_path.display()))?;
-        validate_esp_fstype(&esp_dir)?;
-
-        let sysroot_dir = openat::Dir::open(sysroot)
-            .context("Opening sysroot for reading")?;
+        let sysroot_dir = openat::Dir::open(sysroot).context("Opening sysroot for reading")?;
 
-        // Copy each component
-        for efi_comp in &efi_comps {
-            log::info!(
-                "Copying EFI component {} version {} to ESP",
-                efi_comp.name,
-                efi_comp.version
-            );
-
-            let dest_str = esp_path.to_str().context("ESP path contains invalid UTF-8")?;
-            filetree::copy_dir_with_args(&sysroot_dir, efi_comp.path.as_str(), dest_str, OPTIONS)
+        // Copy to all ESPs
+        for esp in esp_devices {
+            let esp_path = self.ensure_mounted_esp(sysroot, Path::new(&esp))?;
+
+            let esp_dir = openat::Dir::open(&esp_path)
+                .with_context(|| format!("Opening ESP at {}", esp_path.display()))?;
+            validate_esp_fstype(&esp_dir)?;
+
+            // Copy each component
+            for efi_comp in &efi_comps {
+                log::info!(
+                    "Copying EFI component {} version {} to ESP at {}",
+                    efi_comp.name,
+                    efi_comp.version,
+                    esp_path.display()
+                );
+
+                let dest_str = esp_path
+                    .to_str()
+                    .context("ESP path contains invalid UTF-8")?;
+                filetree::copy_dir_with_args(
+                    &sysroot_dir,
+                    efi_comp.path.as_str(),
+                    dest_str,
+                    OPTIONS,
+                )
                 .with_context(|| {
                     format!(
                         "Failed to copy {} from {} to {}",
                         efi_comp.name, efi_comp.path, dest_str
                     )
                 })?;
-        }
+            }
 
-        // Sync filesystem
-        let efidir = openat::Dir::open(&esp_path.join("EFI"))
-            .context("Opening EFI directory for sync")?;
-        fsfreeze_thaw_cycle(efidir.open_file(".")?)?;
+            // Sync filesystem
+            let efidir = openat::Dir::open(&esp_path.join("EFI"))
+                .context("Opening EFI directory for sync")?;
+            fsfreeze_thaw_cycle(efidir.open_file(".")?)?;
+        }
 
-        log::info!("Successfully copied {} EFI component(s) to ESP", efi_comps.len());
+        log::info!("Successfully copied {} EFI component(s) to all ESPs", efi_comps.len());
         Ok(())
     }
 }