composefs/uki: Install all UKIs in EFI/Linux/bootc

We were making a distinction based on the bootloader and installing UKIs
in EFI/Linux for Grub and EFI/Linux/bootc for sd-boot. IMO it's better
if we use the same directory for both bootloaders

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

Author: Johan-Liebert1

crates/lib/src/bootc_composefs/boot.rs

@@ -137,7 +137,7 @@ const AUTH_EXT: &str = "auth";
 /// directory specified by the BLS spec. We do this because we want systemd-boot to only look at
 /// our config files and not show the actual UKIs in the bootloader menu
 /// This is relative to the ESP
-pub(crate) const SYSTEMD_UKI_DIR: &str = "EFI/Linux/bootc";
+pub(crate) const BOOTC_UKI_DIR: &str = "EFI/Linux/bootc";
 
 pub(crate) enum BootSetupType<'a> {
     /// For initial setup, i.e. install to-disk
@@ -793,7 +793,6 @@ fn write_pe_to_esp(
     uki_id: &Sha512HashValue,
     missing_fsverity_allowed: bool,
     mounted_efi: impl AsRef<Path>,
-    bootloader: &Bootloader,
 ) -> Result<Option<UKIInfo>> {
     let efi_bin = read_file(file, &repo).context("Reading .efi binary")?;
 
@@ -843,14 +842,8 @@ fn write_pe_to_esp(
         });
     }
 
-    // Write the UKI to ESP
-    let efi_linux_path = mounted_efi.as_ref().join(match bootloader {
-        Bootloader::Grub => EFI_LINUX,
-        Bootloader::Systemd => SYSTEMD_UKI_DIR,
-        Bootloader::None => unreachable!("Checked at install time"),
-    });
-
-    create_dir_all(&efi_linux_path).context("Creating EFI/Linux")?;
+    let efi_linux_path = mounted_efi.as_ref().join(BOOTC_UKI_DIR);
+    create_dir_all(&efi_linux_path).context("Creating bootc UKI directory")?;
 
     let final_pe_path = match file_path.parent() {
         Some(parent) => {
@@ -1000,7 +993,7 @@ fn write_systemd_uki_config(
     bls_conf
         .with_title(boot_label.boot_label)
         .with_cfg(BLSConfigType::EFI {
-            efi: format!("/{SYSTEMD_UKI_DIR}/{}{}", id.to_hex(), EFI_EXT).into(),
+            efi: format!("/{BOOTC_UKI_DIR}/{}{}", id.to_hex(), EFI_EXT).into(),
         })
         .with_sort_key(primary_sort_key.clone())
         .with_version(boot_label.version.unwrap_or_else(|| id.to_hex()));
@@ -1143,7 +1136,6 @@ pub(crate) fn setup_composefs_uki_boot(
                     &id,
                     missing_fsverity_allowed,
                     esp_mount.dir.path(),
-                    &bootloader,
                 )?;
 
                 if let Some(label) = ret {

crates/lib/src/bootc_composefs/gc.rs

@@ -13,7 +13,7 @@ use rustix::fs::readlink;
 
 use crate::{
     bootc_composefs::{
-        boot::{BootType, SYSTEMD_UKI_DIR, VMLINUZ},
+        boot::{BootType, BOOTC_UKI_DIR, VMLINUZ},
         delete::{delete_image, delete_staged, delete_state_dir},
         status::{get_composefs_status, get_imginfo, list_bootloader_entries},
     },
@@ -83,7 +83,7 @@ fn collect_boot_binaries(storage: &Storage) -> Result<Vec<BootBinary>> {
 /// Scan for UKI binaries in EFI/Linux/bootc
 #[fn_error_context::context("Collecting UKI binaries")]
 fn collect_uki_binaries(boot_dir: &Dir, boot_binaries: &mut Vec<BootBinary>) -> Result<()> {
-    let Ok(Some(efi_dir)) = boot_dir.open_dir_optional(SYSTEMD_UKI_DIR) else {
+    let Ok(Some(efi_dir)) = boot_dir.open_dir_optional(BOOTC_UKI_DIR) else {
         return Ok(());
     };
 
@@ -164,7 +164,7 @@ fn delete_uki(storage: &Storage, uki_id: &str, dry_run: bool) -> Result<()> {
 
     // NOTE: We don't delete global addons here
     // Which is fine as global addons don't belong to any single deployment
-    let uki_dir = esp_mnt.fd.open_dir(SYSTEMD_UKI_DIR)?;
+    let uki_dir = esp_mnt.fd.open_dir(BOOTC_UKI_DIR)?;
 
     for entry in uki_dir.entries_utf8()? {
         let entry = entry?;

crates/lib/src/bootc_composefs/utils.rs

@@ -1,6 +1,6 @@
 use crate::{
     bootc_composefs::{
-        boot::{SYSTEMD_UKI_DIR, compute_boot_digest_uki},
+        boot::{BOOTC_UKI_DIR, compute_boot_digest_uki},
         state::update_boot_digest_in_origin,
     },
     store::Storage,
@@ -10,7 +10,7 @@ use bootc_kernel_cmdline::utf8::Cmdline;
 use fn_error_context::context;
 
 fn get_uki(storage: &Storage, deployment_verity: &str) -> Result<Vec<u8>> {
-    let uki_dir = storage.require_esp()?.fd.open_dir(SYSTEMD_UKI_DIR)?;
+    let uki_dir = storage.require_esp()?.fd.open_dir(BOOTC_UKI_DIR)?;
 
     let req_fname = format!("{deployment_verity}.efi");
 

crates/lib/src/parsers/grub_menuconfig.rs

@@ -15,6 +15,8 @@ use nom::{
     sequence::delimited,
 };
 
+use crate::bootc_composefs::boot::BOOTC_UKI_DIR;
+
 /// Body content of a GRUB menuentry containing parsed commands.
 #[derive(Debug, PartialEq, Eq)]
 pub(crate) struct MenuentryBody<'a> {
@@ -95,7 +97,7 @@ impl<'a> MenuEntry<'a> {
             title: format!("{boot_label}: ({uki_id})"),
             body: MenuentryBody {
                 insmod: vec!["fat", "chain"],
-                chainloader: format!("/EFI/Linux/{uki_id}.efi"),
+                chainloader: format!("/{BOOTC_UKI_DIR}/{uki_id}.efi"),
                 search: "--no-floppy --set=root --fs-uuid \"${EFI_PART_UUID}\"",
                 version: 0,
                 extra: vec![],