Add package-mode copy-to-boot functionality

This is part of Fedora BootLoaderUpdatesPhase1:
https://fedoraproject.org/wiki/Changes/BootLoaderUpdatesPhase1

Author: yasminvalim

src/bootupd.rs

@@ -683,6 +683,23 @@ pub(crate) fn client_run_migrate_static_grub_config() -> Result<()> {
     Ok(())
 }
 
+/// Copy bootloader files from /usr/lib/efi to boot/ESP for package mode installations.
+pub(crate) fn copy_to_boot() -> Result<()> {
+    let all_components = get_components_impl(false);
+    if all_components.is_empty() {
+        println!("No components available for this platform.");
+        return Ok(());
+    }
+
+    for component in all_components.values() {
+        component.package_mode_copy_to_boot().with_context(|| {
+            format!("Failed to copy component {} to boot", component.name())
+        })?;
+    }
+
+    Ok(())
+}
+
 /// Writes a stripped GRUB config to `stripped_config_name`, removing lines between
 /// `### BEGIN /etc/grub.d/15_ostree ###` and `### END /etc/grub.d/15_ostree ###`.
 fn strip_grub_config_file(

src/cli/bootupd.rs

@@ -35,6 +35,11 @@ pub enum DVerb {
     GenerateUpdateMetadata(GenerateOpts),
     #[clap(name = "install", about = "Install components")]
     Install(InstallOpts),
+    #[clap(
+        name = "copy-to-boot",
+        about = "Copy bootloader files from /usr/lib/efi to boot/ESP (package mode)"
+    )]
+    CopyToBoot,
 }
 
 #[derive(Debug, Parser)]
@@ -88,6 +93,7 @@ impl DCommand {
         match self.cmd {
             DVerb::Install(opts) => Self::run_install(opts),
             DVerb::GenerateUpdateMetadata(opts) => Self::run_generate_meta(opts),
+            DVerb::CopyToBoot => Self::run_copy_to_boot(),
         }
     }
 
@@ -122,4 +128,9 @@ impl DCommand {
         .context("boot data installation failed")?;
         Ok(())
     }
+
+    pub(crate) fn run_copy_to_boot() -> Result<()> {
+        bootupd::copy_to_boot().context("copying to boot failed")?;
+        Ok(())
+    }
 }

src/component.rs

@@ -79,6 +79,11 @@ pub(crate) trait Component {
 
     /// Locating efi vendor dir
     fn get_efi_vendor(&self, sysroot: &Path) -> Result<Option<String>>;
+
+    /// Package mode copy: Simple copy from /usr/lib/efi to boot/ESP.
+    fn package_mode_copy_to_boot(&self) -> Result<()> {
+        Ok(())
+    }
 }
 
 /// Given a component name, create an implementation.

src/efi.rs

@@ -183,6 +183,71 @@ impl Efi {
         clear_efi_target(&product_name)?;
         create_efi_boot_entry(device, esp_part_num.trim(), &loader, &product_name)
     }
+
+    /// 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")?;
+
+        // Find components in /usr/lib/efi
+        let efi_comps = match get_efi_component_from_usr(sysroot_path, EFILIB)? {
+            Some(comps) if !comps.is_empty() => comps,
+            _ => {
+                log::debug!("No EFI components found in /usr/lib/efi");
+                return Ok(());
+            }
+        };
+
+        // 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))?
+            }
+        };
+
+        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")?;
+
+        // 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)
+                .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(".")?)?;
+
+        log::info!("Successfully copied {} EFI component(s) to ESP", efi_comps.len());
+        Ok(())
+    }
 }
 
 #[context("Get product name")]
@@ -622,6 +687,11 @@ impl Component for Efi {
             anyhow::bail!("Failed to find {SHIM} in the image")
         }
     }
+
+    /// Package mode copy: Simple copy from /usr/lib/efi to boot/ESP.
+    fn package_mode_copy_to_boot(&self) -> Result<()> {
+        self.package_mode_copy_to_boot_impl()
+    }
 }
 
 impl Drop for Efi {