efi: Fix the failed validation if installing from usr/lib/efi

HuijingHei · HuijingHei · commit 26046df5fa19 · 2025-09-29T20:16:16.000+08:00
diff --git a/src/efi.rs b/src/efi.rs
@@ -5,6 +5,7 @@
  */
 
 use std::cell::RefCell;
+use std::collections::BTreeMap;
 use std::os::unix::io::AsRawFd;
 use std::path::{Path, PathBuf};
 use std::process::Command;
@@ -580,14 +581,26 @@ impl Component for Efi {
             .as_ref()
             .ok_or_else(|| anyhow::anyhow!("No filetree for installed EFI found!"))?;
 
+        // Remove EFI prefix of the current filetree children path
+        // "shim/<ver>/EFI/fedora/shim.efi" -> "fedora/shim.efi"
+        let mut prune_children = BTreeMap::new();
+        for (pathstr, info) in currentf.children.iter() {
+            let path = Utf8Path::new(pathstr);
+            let prune_path = filetree::get_dest_efi_path(path).to_string();
+            prune_children.insert(prune_path, info.to_owned());
+        }
+        let curentf_prune = filetree::FileTree {
+            children: prune_children,
+        };
+
         let mut errs = Vec::new();
         let esp_devices = esp_devices.unwrap_or_default();
         for esp in esp_devices.iter() {
             let destpath = &self.ensure_mounted_esp(Path::new("/"), Path::new(&esp))?;
 
             let efidir = openat::Dir::open(&destpath.join("EFI"))
                 .with_context(|| format!("opening EFI dir {}", destpath.display()))?;
-            let diff = currentf.relative_diff_to(&efidir)?;
+            let diff = curentf_prune.relative_diff_to(&efidir)?;
 
             for f in diff.changes.iter() {
                 errs.push(format!("Changed: {}", f));
diff --git a/src/filetree.rs b/src/filetree.rs
@@ -406,7 +406,7 @@ fn get_first_dir(path: &Utf8Path) -> Result<(Utf8PathBuf, String)> {
     target_arch = "aarch64",
     target_arch = "riscv64"
 ))]
-fn get_dest_efi_path(path: &Utf8Path) -> Utf8PathBuf {
+pub(crate) 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();
