Merge pull request containers#633 from HuijingHei/efi-vendor-dir

grubconfig: handle efi vendordir better
cgwalters · Mar 26, 2024 · f361266 · f361266
2 parents e29257b + fef2cb8
commit f361266
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 6 deletions.
diff --git a/src/efi.rs b/src/efi.rs
@@ -25,7 +25,7 @@ pub(crate) const ESP_MOUNTS: &[&str] = &["boot/efi", "efi", "boot"];
 
 /// The binary to change EFI boot ordering
 const EFIBOOTMGR: &str = "efibootmgr";
-const SHIM: &str = "shimx64.efi";
+pub(crate) const SHIM: &str = "shimx64.efi";
 
 /// The ESP partition label on Fedora CoreOS derivatives
 pub(crate) const COREOS_ESP_PART_LABEL: &str = "EFI-SYSTEM";

diff --git a/src/grubconfigs.rs b/src/grubconfigs.rs
@@ -1,5 +1,4 @@
 use std::fmt::Write;
-use std::os::unix::prelude::OsStrExt;
 use std::path::{Path, PathBuf};
 
 use anyhow::{anyhow, Context, Result};
@@ -15,14 +14,19 @@ const DROPINDIR: &str = "configs.d";
 pub(crate) fn find_efi_vendordir(efidir: &openat::Dir) -> Result<PathBuf> {
     for d in efidir.list_dir(".")? {
         let d = d?;
-        if d.file_name().as_bytes() == b"BOOT" {
-            continue;
-        }
         let meta = efidir.metadata(d.file_name())?;
         if !meta.is_dir() {
             continue;
         }
-        return Ok(d.file_name().into());
+        // skip if not find shim under dir
+        let dir = efidir.sub_dir(d.file_name())?;
+        for entry in dir.list_dir(".")? {
+            let entry = entry?;
+            if entry.file_name() != super::efi::SHIM {
+                continue;
+            }
+            return Ok(d.file_name().into());
+        }
     }
     anyhow::bail!("Failed to find EFI vendor dir")
 }
@@ -142,4 +146,30 @@ mod tests {
         assert!(td.exists("boot/efi/EFI/fedora/grub.cfg")?);
         Ok(())
     }
+
+    #[test]
+    fn test_find_efi_vendordir() -> Result<()> {
+        let td = tempfile::tempdir()?;
+        let tdp = td.path();
+        let efidir = tdp.join("EFI");
+        std::fs::create_dir_all(efidir.join("BOOT"))?;
+        std::fs::create_dir_all(efidir.join("dell"))?;
+        std::fs::create_dir_all(efidir.join("fedora"))?;
+        let td = openat::Dir::open(&efidir)?;
+
+        std::fs::write(efidir.join("dell").join("foo"), "foo data")?;
+        std::fs::write(efidir.join("fedora").join("grub.cfg"), "grub config")?;
+        std::fs::write(efidir.join("fedora").join("shimx64.efi"), "shim data")?;
+
+        assert!(td.exists("BOOT")?);
+        assert!(td.exists("dell/foo")?);
+        assert!(td.exists("fedora/grub.cfg")?);
+        assert!(td.exists("fedora/shimx64.efi")?);
+        assert_eq!(find_efi_vendordir(&td)?.to_str(), Some("fedora"));
+
+        std::fs::remove_file(efidir.join("fedora").join("shimx64.efi"))?;
+        let x = find_efi_vendordir(&td);
+        assert_eq!(x.is_err(), true);
+        Ok(())
+    }
 }