copy-to-boot: caller-provided root, require trait impl, error on no components

Implementing code review changes

Author: yasminvalim

src/bios.rs

@@ -276,4 +276,9 @@ impl Component for Bios {
     fn get_efi_vendor(&self, _: &Path) -> Result<Option<String>> {
         Ok(None)
     }
+
+    /// Package mode copy is EFI-only
+    fn package_mode_copy_to_boot(&self, _root: &Path) -> Result<()> {
+        Ok(())
+    }
 }

src/bootupd.rs

@@ -689,16 +689,15 @@ pub(crate) fn client_run_migrate_static_grub_config() -> Result<()> {
 }
 
 /// Copy bootloader files from /usr/lib/efi to boot/ESP for package mode installations.
-pub(crate) fn copy_to_boot() -> Result<()> {
+pub(crate) fn copy_to_boot(root: &Path) -> Result<()> {
     let all_components = get_components_impl(false);
     if all_components.is_empty() {
-        println!("No components available for this platform.");
-        return Ok(());
+        anyhow::bail!("No components available for this platform.");
     }
 
     for component in all_components.values() {
         component
-            .package_mode_copy_to_boot()
+            .package_mode_copy_to_boot(root)
             .with_context(|| format!("Failed to copy component {} to boot", component.name()))?;
     }
 

src/cli/bootupd.rs

@@ -37,7 +37,7 @@ pub enum DVerb {
     Install(InstallOpts),
     #[clap(
         name = "copy-to-boot",
-        about = "Copy bootloader files from /usr/lib/efi to boot/ESP (package mode)"
+        about = "Copy bootloader files from /usr/lib/efi to ESP (package mode), EFI only"
     )]
     CopyToBoot,
 }
@@ -130,7 +130,7 @@ impl DCommand {
     }
 
     pub(crate) fn run_copy_to_boot() -> Result<()> {
-        bootupd::copy_to_boot().context("copying to boot failed")?;
+        bootupd::copy_to_boot(std::path::Path::new("/")).context("copying to boot failed")?;
         Ok(())
     }
 }

src/component.rs

@@ -80,10 +80,8 @@ pub(crate) trait Component {
     /// Locating efi vendor dir
     fn get_efi_vendor(&self, sysroot: &Path) -> Result<Option<String>>;
 
-    /// Copy from /usr/lib/efi to boot/ESP.
-    fn package_mode_copy_to_boot(&self) -> Result<()> {
-        Ok(())
-    }
+    /// Copy from /usr/lib/efi to boot/ESP (package mode)
+    fn package_mode_copy_to_boot(&self, root: &Path) -> Result<()>;
 }
 
 /// Given a component name, create an implementation.