composefs/boot: Copy system-boot binaries manually

On systemd v258, bootctl doesn't copy the systemd-boot binaries to the
ESP, so we copy the binaries ourselves if we don't find them in the
final ESP

Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>

Author: Johan-Liebert1

.github/workflows/ci.yml

@@ -193,8 +193,6 @@ jobs:
             ;;
           esac
 
-
-
           if [ "${{ matrix.variant }}" = "composefs-sealeduki-sdboot" ]; then
             BUILDROOTBASE=$(just pullspec-for-os buildroot-base ${{ matrix.test_os }})
             echo "BOOTC_buildroot_base=${BUILDROOTBASE}" >> $GITHUB_ENV

crates/lib/src/bootc_composefs/boot.rs

@@ -1248,6 +1248,7 @@ pub(crate) async fn setup_composefs_boot(
             &state.config_opts,
             None,
             get_secureboot_keys(&mounted_fs, BOOTC_AUTOENROLL_PATH)?,
+            &mounted_fs,
         )?;
     }
 

crates/lib/src/bootloader.rs

@@ -158,13 +158,14 @@ pub(crate) fn install_via_bootupd(
     }
 }
 
-#[context("Installing bootloader")]
+#[context("Installing systemd boot")]
 pub(crate) fn install_systemd_boot(
     device: &PartitionTable,
     _rootfs: &Utf8Path,
     _configopts: &crate::install::InstallConfigOpts,
     _deployment_path: Option<&str>,
     autoenroll: Option<SecurebootKeys>,
+    mounted_erofs: &Dir,
 ) -> Result<()> {
     let esp_part = device
         .find_partition_of_type(discoverable_partition_specification::ESP)
@@ -180,6 +181,73 @@ pub(crate) fn install_systemd_boot(
         .log_debug()
         .run_inherited_with_cmd_context()?;
 
+    // Check for systemd-boot binaries in the EFI/systemd directory
+    // systemd v258 won't copy the binary if an EFI booted system is not detected
+    let systemd_dir = esp_mount.fd.open_dir_optional("EFI/systemd")?;
+
+    let systemd_boot_found = if let Some(dir) = systemd_dir {
+        let mut found = false;
+        for entry in dir.entries()? {
+            let entry = entry?;
+            let name = entry.file_name();
+
+            if let Some(name_str) = name.to_str() {
+                if name_str.starts_with("systemd-boot") && name_str.ends_with(".efi") {
+                    found = true;
+                    break;
+                }
+            }
+        }
+
+        found
+    } else {
+        false
+    };
+
+    if !systemd_boot_found {
+        println!("Copying systemd-boot binary manually");
+
+        // Find the systemd-boot binary in the source directory
+        let boot_dir = mounted_erofs.open_dir("usr/lib/systemd/boot/efi")?;
+        let mut systemd_boot_binary = None;
+
+        for entry in boot_dir.entries()? {
+            let entry = entry?;
+            let name = entry.file_name();
+            if let Some(name_str) = name.to_str() {
+                if name_str.starts_with("systemd-boot") && name_str.ends_with(".efi") {
+                    systemd_boot_binary = Some(name_str.to_string());
+                    break;
+                }
+            }
+        }
+
+        let binary_name = systemd_boot_binary
+            .ok_or_else(|| anyhow::anyhow!("No systemd-boot binary found in source"))?;
+
+        let src_path = format!("usr/lib/systemd/boot/efi/{}", binary_name);
+        let systemd_dest_path = format!("EFI/systemd/{}", binary_name);
+
+        // Determine the appropriate BOOT binary name based on architecture
+        let boot_binary_name = if binary_name.contains("x64") {
+            "BOOTX64.EFI"
+        } else if binary_name.contains("ia32") {
+            "BOOTIA32.EFI"
+        } else if binary_name.contains("aa64") {
+            "BOOTAA64.EFI"
+        } else {
+            "BOOTX64.EFI" // Default fallback
+        };
+
+        mounted_erofs.copy(&src_path, &esp_mount.fd, &systemd_dest_path)?;
+
+        mounted_erofs.copy(
+            &src_path,
+            &esp_mount.fd,
+            &format!("EFI/BOOT/{}", boot_binary_name),
+        )?;
+    }
+
     if let Some(SecurebootKeys { dir, keys }) = autoenroll {
         let path = esp_path.join(SYSTEMD_KEY_DIR);
         create_dir_all(&path)?;