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

Author: HuijingHei

src/efi.rs

@@ -319,9 +319,22 @@ impl Component for Efi {
             return Ok(None);
         };
 
+        let efilib_path = rootcxt.path.join(EFILIB);
+        let efi_comps = if efilib_path.exists() {
+            get_efi_component_from_usr(&rootcxt.path, EFILIB)?
+        } else {
+            None
+        };
+
+        let updated_path = if efi_comps.is_some() {
+            PathBuf::from(EFILIB)
+        } else {
+            component_updatedirname(self)
+        };
+
         let updated = rootcxt
             .sysroot
-            .sub_dir(&component_updatedirname(self))
+            .sub_dir(&updated_path)
             .context("opening update dir")?;
         let updatef = filetree::FileTree::new_from_dir(&updated).context("reading update dir")?;
 
@@ -448,11 +461,28 @@ impl Component for Efi {
             .ok_or_else(|| anyhow::anyhow!("No filetree for installed EFI found!"))?;
         let sysroot_dir = &rootcxt.sysroot;
         let updatemeta = self.query_update(sysroot_dir)?.expect("update available");
+
+        let efilib_path = rootcxt.path.join(EFILIB);
+        let efi_comps = if efilib_path.exists() {
+            get_efi_component_from_usr(&rootcxt.path, EFILIB)?
+        } else {
+            None
+        };
+
+        let updated_path = if efi_comps.is_some() {
+            PathBuf::from(EFILIB)
+        } else {
+            component_updatedirname(self)
+        };
+
         let updated = sysroot_dir
-            .sub_dir(&component_updatedirname(self))
+            .sub_dir(&updated_path)
             .context("opening update dir")?;
         let updatef = filetree::FileTree::new_from_dir(&updated).context("reading update dir")?;
         let diff = currentf.diff(&updatef)?;
+        dbg!(&currentf);
+        dbg!(&updatef);
+        dbg!(&diff);
 
         let Some(esp_devices) = blockdev::find_colocated_esps(&rootcxt.devices)? else {
             anyhow::bail!("Failed to find all esp devices");

src/filetree.rs

@@ -366,7 +366,7 @@ pub(crate) fn copy_dir(root: &openat::Dir, src: &str, dst: &str) -> Result<()> {
     target_arch = "aarch64",
     target_arch = "riscv64"
 ))]
-fn get_first_dir(path: &Utf8Path) -> Result<(&Utf8Path, String)> {
+fn get_first_dir(path: &Utf8Path) -> Result<(Utf8PathBuf, String)> {
     let first = path
         .iter()
         .next()
@@ -376,6 +376,15 @@ fn get_first_dir(path: &Utf8Path) -> Result<(&Utf8Path, String)> {
     Ok((first.into(), tmp))
 }
 
+/// Get dest efi path "shim/<ver>/EFI/fedora/shim.efi" -> "fedora/shim.efi"
+fn get_dest_efi_path(path: &Utf8Path) -> Utf8PathBuf {
+    let parts: Vec<_> = path.iter().collect();
+    if parts.get(2).map(|c| *c == "EFI").unwrap_or(false) {
+        return parts.iter().skip(3).collect();
+    }
+    path.to_path_buf()
+}
+
 /// Given two directories, apply a diff generated from srcdir to destdir
 #[cfg(any(
     target_arch = "x86_64",
@@ -398,8 +407,8 @@ pub(crate) fn apply_diff(
     // Handle removals in temp dir, or remove directly if file not in dir
     if !opts.skip_removals {
         for pathstr in diff.removals.iter() {
-            let path = Utf8Path::new(pathstr);
-            let (first_dir, first_dir_tmp) = get_first_dir(path)?;
+            let path = get_dest_efi_path(Utf8Path::new(pathstr));
+            let (first_dir, first_dir_tmp) = get_first_dir(&path)?;
             let path_tmp;
             if first_dir != path {
                 path_tmp = Utf8Path::new(&first_dir_tmp).join(path.strip_prefix(&first_dir)?);
@@ -421,8 +430,9 @@ pub(crate) fn apply_diff(
     }
     // Write changed or new files to temp dir or temp file
     for pathstr in diff.changes.iter().chain(diff.additions.iter()) {
-        let path = Utf8Path::new(pathstr);
-        let (first_dir, first_dir_tmp) = get_first_dir(path)?;
+        let src_path = Utf8Path::new(pathstr);
+        let path = get_dest_efi_path(src_path);
+        let (first_dir, first_dir_tmp) = get_first_dir(&path)?;
         let mut path_tmp = Utf8PathBuf::from(&first_dir_tmp);
         if first_dir != path {
             if !destdir.exists(&first_dir_tmp)? && destdir.exists(first_dir.as_std_path())? {
@@ -443,7 +453,7 @@ pub(crate) fn apply_diff(
         }
         updates.insert(first_dir, first_dir_tmp);
         srcdir
-            .copy_file_at(path.as_std_path(), destdir, path_tmp.as_std_path())
+            .copy_file_at(src_path.as_std_path(), destdir, path_tmp.as_std_path())
             .with_context(|| format!("copying {:?} to {:?}", path, path_tmp))?;
     }