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 <[email protected]>

Author: Johan-Liebert1

crates/lib/src/bootc_composefs/boot.rs

@@ -73,7 +73,7 @@ const VMLINUZ: &str = "vmlinuz";
 /// 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
@@ -420,7 +420,7 @@ pub(crate) fn setup_composefs_bls_boot(
             let current_cfg = get_booted_bls(&boot_dir)?;
 
             let mut cmdline = match current_cfg.cfg_type {
-                BLSConfigType::NonEFI { options, .. } => {
+                BLSConfigType::NonUKI { options, .. } => {
                     let options = options
                         .ok_or_else(|| anyhow::anyhow!("No 'options' found in BLS Config"))?;
 
@@ -658,7 +658,6 @@ fn write_pe_to_esp(
     uki_id: &Sha512HashValue,
     is_insecure_from_opts: bool,
     mounted_efi: impl AsRef<Path>,
-    bootloader: &Bootloader,
 ) -> Result<Option<UKILabels>> {
     let efi_bin = read_file(file, &repo).context("Reading .efi binary")?;
 
@@ -703,13 +702,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,
-    });
-
-    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) => {
@@ -858,7 +852,7 @@ fn write_systemd_uki_config(
     bls_conf
         .with_title(boot_label.boot_label)
         .with_cfg(BLSConfigType::UKI {
-            uki: format!("/{SYSTEMD_UKI_DIR}/{}{}", id.to_hex(), EFI_EXT).into(),
+            uki: format!("/{BOOTC_UKI_DIR}/{}{}", id.to_hex(), EFI_EXT).into(),
         })
         .with_sort_key(default_sort_key.into())
         .with_version(boot_label.version.unwrap_or(default_sort_key.into()));
@@ -998,7 +992,6 @@ pub(crate) fn setup_composefs_uki_boot(
                     &id,
                     is_insecure_from_opts,
                     esp_mount.dir.path(),
-                    &bootloader,
                 )?;
 
                 if let Some(label) = ret {

crates/lib/src/bootc_composefs/delete.rs

@@ -7,7 +7,7 @@ use composefs_boot::bootloader::{EFI_ADDON_DIR_EXT, EFI_EXT};
 
 use crate::{
     bootc_composefs::{
-        boot::{find_vmlinuz_initrd_duplicates, get_efi_uuid_source, BootType, SYSTEMD_UKI_DIR},
+        boot::{find_vmlinuz_initrd_duplicates, get_efi_uuid_source, BootType, BOOTC_UKI_DIR},
         gc::composefs_gc,
         repo::open_composefs_repo,
         rollback::{composefs_rollback, rename_exchange_user_cfg},
@@ -153,7 +153,7 @@ fn delete_kernel_initrd(bls_config: &BLSConfigType, boot_dir: &Dir) -> Result<()
 #[fn_error_context::context("Deleting UKI and UKI addons {uki_id}")]
 fn delete_uki(uki_id: &str, esp_mnt: &Dir) -> Result<()> {
     // TODO: We don't delete global addons here
-    let ukis = esp_mnt.open_dir(SYSTEMD_UKI_DIR)?;
+    let ukis = esp_mnt.open_dir(BOOTC_UKI_DIR)?;
 
     for entry in ukis.entries_utf8()? {
         let entry = entry?;

crates/lib/src/parsers/grub_menuconfig.rs

@@ -15,6 +15,8 @@ use nom::{
     Err, IResult, Parser,
 };
 
+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![],