fix: preserve ESP-only files

Author: yasminvalim

src/efi.rs

@@ -21,10 +21,8 @@ use openat_ext::OpenatDirExt;
 use os_release::OsRelease;
 use rustix::mount::{
     fsconfig_create, fsconfig_set_path, fsmount, fsopen, move_mount, FsMountFlags, FsOpenFlags,
-    MountAttrFlags, MoveMountFlags, UnmountFlags,
+    MoveMountFlags, MountAttrFlags, UnmountFlags,
 };
-use rustix::{fd::AsFd, fd::BorrowedFd, fs::StatVfsMountFlags};
-use walkdir::WalkDir;
 use widestring::U16CString;
 
 use bootc_internal_blockdev::Device;
@@ -95,15 +93,10 @@ fn mount_esp(esp_device: &Path, target: &Path) -> Result<()> {
     use rustix::fs::CWD;
 
     let fs_fd = fsopen("vfat", FsOpenFlags::empty()).context("fsopen vfat")?;
-    fsconfig_set_path(fs_fd.as_fd(), "source", esp_device, CWD)
-        .context("fsconfig_set_path source")?;
+    fsconfig_set_path(fs_fd.as_fd(), "source", esp_device, CWD).context("fsconfig_set_path source")?;
     fsconfig_create(fs_fd.as_fd()).context("fsconfig_create")?;
-    let mount_fd = fsmount(
-        fs_fd.as_fd(),
-        FsMountFlags::empty(),
-        MountAttrFlags::empty(),
-    )
-    .context("fsmount")?;
+    let mount_fd =
+        fsmount(fs_fd.as_fd(), FsMountFlags::empty(), MountAttrFlags::empty()).context("fsmount")?;
     let target_dir = std::fs::File::open(target).context("open target dir for move_mount")?;
     let target_fd = unsafe { BorrowedFd::borrow_raw(target_dir.as_raw_fd()) };
     move_mount(
@@ -294,40 +287,32 @@ impl Efi {
         let device_path = device.path();
         create_efi_boot_entry(&device_path, esp_part_num.trim(), &loader, &product_name)
     }
-    /// Copy EFI components to ESP using the same "write alongside + atomic rename" pattern
-    /// as bootable container updates, so the system stays bootable if any step fails.
     fn copy_efi_components_to_esp(
         &self,
         sysroot_dir: &openat::Dir,
         esp_dir: &openat::Dir,
-        _esp_path: &Path,
+        esp_path: &Path,
         efi_components: &[EFIComponent],
     ) -> Result<()> {
-        // Build a merged source tree in a temp dir (same layout as desired ESP/EFI)
-        let temp_dir = tempfile::tempdir().context("Creating temp dir for EFI merge")?;
-        let temp_efi_path = temp_dir.path().join("EFI");
-        std::fs::create_dir_all(&temp_efi_path)
-            .with_context(|| format!("Creating {}", temp_efi_path.display()))?;
-        let temp_efi_str = temp_efi_path
+        let dest_str = esp_path
             .to_str()
-            .context("Temp EFI path is not valid UTF-8")?;
+            .with_context(|| format!("Invalid UTF-8: {}", esp_path.display()))?;
 
         for efi_comp in efi_components {
             log::info!(
-                "Merging EFI component {} version {} into update tree",
+                "Copying EFI component {} version {} to ESP at {}",
                 efi_comp.name,
-                efi_comp.version
+                efi_comp.version,
+                esp_path.display()
             );
-            // Copy contents of component's EFI dir (e.g. fedora/) into temp_efi_path so merged
-            // layout is EFI/fedora/..., not EFI/EFI/fedora/...
-            let src_efi_contents = format!("{}/.", efi_comp.path);
-            filetree::copy_dir_with_args(
-                sysroot_dir,
-                src_efi_contents.as_str(),
-                temp_efi_str,
-                OPTIONS,
-            )
-            .with_context(|| format!("Copying {} to merge dir", efi_comp.path))?;
+
+            filetree::copy_dir_with_args(sysroot_dir, efi_comp.path.as_str(), dest_str, OPTIONS)
+                .with_context(|| {
+                    format!(
+                        "Failed to copy {} from {} to {}",
+                        efi_comp.name, efi_comp.path, dest_str
+                    )
+                })?;
         }
 
         // Ensure ESP/EFI exists (e.g. first install)
@@ -370,7 +355,6 @@ impl Efi {
     fn package_mode_copy_to_boot_impl(&self, sysroot: &Path) -> Result<()> {
         let sysroot_path = Utf8Path::from_path(sysroot)
             .with_context(|| format!("Invalid UTF-8: {}", sysroot.display()))?;
-        let sysroot_dir = openat::Dir::open(sysroot).context("Opening sysroot for reading")?;
 
         let efi_comps = match get_efi_component_from_usr(sysroot_path, EFILIB)? {
             Some(comps) if !comps.is_empty() => comps,
@@ -398,6 +382,7 @@ impl Efi {
             .with_context(|| format!("Opening ESP at {}", esp_path.display()))?;
         validate_esp_fstype(&esp_dir)?;
 
+        let sysroot_dir = openat::Dir::open(sysroot).context("Opening sysroot for reading")?;
         self.copy_efi_components_to_esp(&sysroot_dir, &esp_dir, &esp_path, &efi_comps)?;
 
         log::info!(