efi: Extend install() to support usr/lib/efi

Author: HuijingHei

src/efi.rs

@@ -349,8 +349,6 @@ impl Component for Efi {
             anyhow::bail!("No update metadata for component {} found", self.name());
         };
         log::debug!("Found metadata {}", meta.version);
-        let srcdir_name = component_updatedirname(self);
-        let ft = crate::filetree::FileTree::new_from_dir(&src_dir.sub_dir(&srcdir_name)?)?;
 
         // Let's attempt to use an already mounted ESP at the target
         // dest_root if one is already mounted there in a known ESP location.
@@ -371,16 +369,35 @@ impl Component for Efi {
             .with_context(|| format!("opening dest dir {}", destpath.display()))?;
         validate_esp_fstype(destd)?;
 
-        // TODO - add some sort of API that allows directly setting the working
-        // directory to a file descriptor.
-        std::process::Command::new("cp")
-            .args(["-rp", "--reflink=auto"])
-            .arg(&srcdir_name)
-            .arg(destpath)
-            .current_dir(format!("/proc/self/fd/{}", src_dir.as_raw_fd()))
-            .run()?;
+        let src_path = Utf8Path::new(src_root);
+        let efilib_path = src_path.join(EFILIB);
+        let efi_comps = if efilib_path.exists() {
+            get_efi_component_from_usr(&src_path, EFILIB)?
+        } else {
+            None
+        };
+
+        let vendor_path = if let Some(efi_components) = efi_comps {
+            for efi in efi_components {
+                log::trace!("Copy {} to {}", efi.path, destpath.display());
+                util::copy_in_fd(&src_dir, &efi.path, &destpath)?;
+            }
+            efilib_path
+        } else {
+            let updates = Utf8PathBuf::from_path_buf(component_updatedirname(self))
+                .expect("Invalide UTF-8 path");
+
+            util::copy_in_fd(&src_dir, &updates, &destpath)?;
+            updates
+        };
+
+        let ft =
+            crate::filetree::FileTree::new_from_dir(&src_dir.sub_dir(vendor_path.as_std_path())?)?;
+
         if update_firmware {
-            if let Some(vendordir) = self.get_efi_vendor(&Path::new(src_root))? {
+            if let Some(vendordir) =
+                self.get_efi_vendor(src_path.join(vendor_path).as_std_path())?
+            {
                 self.update_firmware(device, destd, &vendordir)?
             }
         }
@@ -449,12 +466,7 @@ impl Component for Efi {
             let mut packages = Vec::new();
             let sysroot_dir = Dir::open_ambient_dir(sysroot_path, cap_std::ambient_authority())?;
             for efi in efi_components {
-                Command::new("cp")
-                    .args(["-rp", "--reflink=auto"])
-                    .arg(&efi.path)
-                    .arg(crate::model::BOOTUPD_UPDATES_DIR)
-                    .current_dir(format!("/proc/self/fd/{}", sysroot_dir.as_raw_fd()))
-                    .run()?;
+                util::copy_in_fd(&sysroot_dir, &efi.path, crate::model::BOOTUPD_UPDATES_DIR)?;
                 packages.push(format!("{}-{}", efi.name, efi.version));
             }
 

src/util.rs

@@ -3,7 +3,10 @@ use std::path::Path;
 use std::process::Command;
 
 use anyhow::{bail, Context, Result};
+use bootc_internal_utils::CommandRunExt;
+use camino::Utf8Path;
 use openat_ext::OpenatDirExt;
+use rustix::fd::AsRawFd;
 
 /// Parse an environment variable as UTF-8
 #[allow(dead_code)]
@@ -120,3 +123,17 @@ impl Drop for SignalTerminationGuard {
         signal_hook_registry::unregister(self.0);
     }
 }
+
+pub(crate) fn copy_in_fd<F: AsRawFd, P1: AsRef<Utf8Path>, P2: AsRef<Path>>(
+    fd: &F,
+    src: P1,
+    dest: P2,
+) -> Result<()> {
+    let cwd = format!("/proc/self/fd/{}", fd.as_raw_fd());
+    Command::new("cp")
+        .args(["-rp", "--reflink=auto"])
+        .arg(src.as_ref())
+        .arg(dest.as_ref())
+        .current_dir(cwd)
+        .run()
+}