install: Fix bug in mount point check

This fixes a regression from #1727
by removing the unnecessary mount point check prior to the recursive
function call. Also adds some tracing statements and updates the
integration test to validate the mount check works for this scenario:

/boot/efi mounted with contents in /boot/efi/EFI/firmware/foo

Signed-off-by: ckyrouac <ckyrouac@redhat.com>

Author: ckyrouac

crates/lib/src/install.rs

@@ -1874,8 +1874,10 @@ pub(crate) async fn install_to_disk(mut opts: InstallToDiskOpts) -> Result<()> {
 /// /var/lib/containers (a mount point).
 #[context("Requiring directory contains only mount points")]
 fn require_dir_contains_only_mounts(parent_fd: &Dir, dir_name: &str) -> Result<()> {
+    tracing::trace!("Checking directory {dir_name} for non-mount entries");
     let Some(dir_fd) = parent_fd.open_dir_noxdev(dir_name)? else {
         // The directory itself is a mount point
+        tracing::trace!("{dir_name} is a mount point");
         return Ok(());
     };
 
@@ -1884,6 +1886,7 @@ fn require_dir_contains_only_mounts(parent_fd: &Dir, dir_name: &str) -> Result<(
     }
 
     for entry in dir_fd.entries()? {
+        tracing::trace!("Checking entry in {dir_name}");
         let entry = DirEntryUtf8::from_cap_std(entry?);
         let entry_name = entry.file_name()?;
 
@@ -1892,7 +1895,7 @@ fn require_dir_contains_only_mounts(parent_fd: &Dir, dir_name: &str) -> Result<(
         }
 
         let etype = entry.file_type()?;
-        if etype == FileType::dir() && dir_fd.open_dir_noxdev(&entry_name)?.is_some() {
+        if etype == FileType::dir() {
             require_dir_contains_only_mounts(&dir_fd, &entry_name)?;
         } else {
             anyhow::bail!("Found entry in {dir_name}: {entry_name}");

crates/tests-integration/src/install.rs

@@ -99,6 +99,10 @@ pub(crate) fn run_alongside(image: &str, mut testargs: libtest_mimic::Arguments)
                 let sh = &xshell::Shell::new()?;
                 reset_root(sh, image)?;
 
+                // Clean up any leftover LVM state from previous failed runs
+                let _ = cmd!(sh, "sudo vgchange -an BL").ignore_status().run();
+                let _ = cmd!(sh, "sudo vgremove -f BL").ignore_status().run();
+
                 // Create work directory for the test
                 let tmpd = sh.create_temp_dir()?;
                 let work_dir = tmpd.path();
@@ -153,13 +157,13 @@ pub(crate) fn run_alongside(image: &str, mut testargs: libtest_mimic::Arguments)
                     cmd!(sh, "sudo partprobe {loop_dev}").run()?;
                     std::thread::sleep(std::time::Duration::from_secs(2));
 
-                    let loop_part2 = format!("{}p2", loop_dev); // EFI
-                    let loop_part3 = format!("{}p3", loop_dev); // Boot
+                    let efi_part2 = format!("{}p2", loop_dev); // EFI
+                    let root_part3 = format!("{}p3", loop_dev); // Boot
                     let loop_part4 = format!("{}p4", loop_dev); // LVM
 
                     // Create filesystems on boot partitions
-                    cmd!(sh, "sudo mkfs.vfat -F32 {loop_part2}").run()?;
-                    cmd!(sh, "sudo mkfs.ext4 -F {loop_part3}").run()?;
+                    cmd!(sh, "sudo mkfs.vfat -F32 {efi_part2}").run()?;
+                    cmd!(sh, "sudo mkfs.ext4 -F {root_part3}").run()?;
 
                     // Setup LVM
                     cmd!(sh, "sudo pvcreate {loop_part4}").run()?;
@@ -178,7 +182,7 @@ pub(crate) fn run_alongside(image: &str, mut testargs: libtest_mimic::Arguments)
                         .read()?
                         .trim()
                         .to_string();
-                    let boot_uuid = cmd!(sh, "sudo blkid -s UUID -o value {loop_part2}")
+                    let boot_uuid = cmd!(sh, "sudo blkid -s UUID -o value {efi_part2}")
                         .read()?
                         .trim()
                         .to_string();
@@ -190,9 +194,15 @@ pub(crate) fn run_alongside(image: &str, mut testargs: libtest_mimic::Arguments)
 
                     cmd!(sh, "sudo mount /dev/BL/root02 {target}").run()?;
                     cmd!(sh, "sudo mkdir -p {target}/boot").run()?;
-                    cmd!(sh, "sudo mount {loop_part3} {target}/boot").run()?;
+                    cmd!(sh, "sudo mount {root_part3} {target}/boot").run()?;
                     cmd!(sh, "sudo mkdir -p {target}/boot/efi").run()?;
-                    cmd!(sh, "sudo mount {loop_part2} {target}/boot/efi").run()?;
+                    cmd!(sh, "sudo mount {efi_part2} {target}/boot/efi").run()?;
+
+                    // Create EFI directory structure with some files (simulating existing EFI content)
+                    // This tests that bootc correctly handles /boot/efi as a mount point
+                    cmd!(sh, "sudo mkdir -p {target}/boot/efi/EFI/fedora").run()?;
+                    cmd!(sh, "sudo touch {target}/boot/efi/EFI/fedora/shimx64.efi").run()?;
+                    cmd!(sh, "sudo touch {target}/boot/efi/EFI/fedora/grubx64.efi").run()?;
 
                     // Critical: Mount /var as a separate partition
                     cmd!(sh, "sudo mkdir -p {target}/var").run()?;