bls_conf: Support 'uki' keyword

Systemd >= v258 supports 'uki' key in bls configs. Update BLSConfig
struct to reflect the same. We still support the 'efi' key for
backwards compatibility

During writing of the BLSConfig files we check for systemd version and
use the appropriate key

GrubCC does not support the 'uki' key right now
See: #2268

Closes: #2263

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

Author: Johan-Liebert1

crates/lib/src/bootc_composefs/backwards_compat/bcompat_boot.rs

@@ -16,7 +16,7 @@ use crate::{
         ORIGIN_KEY_BOOT, ORIGIN_KEY_BOOT_TYPE, STATE_DIR_RELATIVE, TYPE1_BOOT_DIR_PREFIX,
         TYPE1_ENT_PATH_STAGED, UKI_NAME_PREFIX, USER_CFG_STAGED,
     },
-    parsers::bls_config::{BLSConfig, BLSConfigType},
+    parsers::bls_config::{BLSConfig, BLSConfigType, EFIKey},
     spec::BootloaderKind,
     store::Storage,
 };
@@ -214,12 +214,16 @@ fn stage_bls_entry_changes(
                     .collect();
             }
 
-            BLSConfigType::EFI { efi, .. } => {
+            BLSConfigType::EFI { key, .. } => {
                 // boot_dir in case of UKI is the ESP
                 plan_efi_binary_renames(&boot_dir, &digest, &mut rename_transaction)?;
-                *efi = Utf8PathBuf::from("/")
+                let new_path = Utf8PathBuf::from("/")
                     .join(BOOTC_UKI_DIR)
                     .join(get_uki_name(&digest));
+                *key = match key {
+                    EFIKey::Efi(_) => EFIKey::Efi(new_path),
+                    EFIKey::Uki(_) => EFIKey::Uki(new_path),
+                };
             }
 
             _ => anyhow::bail!("Unknown BLS config type"),

crates/lib/src/bootc_composefs/boot.rs

@@ -97,7 +97,7 @@ use crate::bootc_composefs::state::{get_booted_bls, write_composefs_state};
 use crate::bootc_composefs::status::ComposefsCmdline;
 use crate::bootc_kargs::compute_new_kargs;
 use crate::composefs_consts::{TYPE1_BOOT_DIR_PREFIX, TYPE1_ENT_PATH, TYPE1_ENT_PATH_STAGED};
-use crate::parsers::bls_config::{BLSConfig, BLSConfigType};
+use crate::parsers::bls_config::{BLSConfig, BLSConfigType, EFIKey};
 use crate::spec::BootloaderKind;
 use crate::task::Task;
 use crate::{bootc_composefs::repo::open_composefs_repo, store::Storage};
@@ -1002,6 +1002,7 @@ fn write_systemd_uki_config(
     setup_type: &BootSetupType,
     boot_label: UKIInfo,
     id: &Sha512HashValue,
+    bootloader: &Bootloader,
 ) -> Result<()> {
     let os_id = boot_label.os_id.as_deref().unwrap_or("bootc");
     let primary_sort_key = primary_sort_key(os_id);
@@ -1010,7 +1011,10 @@ fn write_systemd_uki_config(
     bls_conf
         .with_title(boot_label.boot_label)
         .with_cfg(BLSConfigType::EFI {
-            efi: format!("/{BOOTC_UKI_DIR}/{}", get_uki_name(&id.to_hex())).into(),
+            key: EFIKey::for_bootloader(
+                format!("/{BOOTC_UKI_DIR}/{}", get_uki_name(&id.to_hex())).into(),
+                bootloader,
+            ),
         })
         .with_sort_key(primary_sort_key.clone())
         .with_version(boot_label.version.unwrap_or_else(|| id.to_hex()));
@@ -1174,7 +1178,7 @@ pub(crate) fn setup_composefs_uki_boot(
         }
 
         BootloaderKind::BLSCompatible => {
-            write_systemd_uki_config(&esp_mount.fd, &setup_type, uki_info, id)?
+            write_systemd_uki_config(&esp_mount.fd, &setup_type, uki_info, id, &bootloader)?
         }
     };
 

crates/lib/src/bootc_composefs/delete.rs

@@ -14,7 +14,7 @@ use crate::{
         COMPOSEFS_STAGED_DEPLOYMENT_FNAME, COMPOSEFS_TRANSIENT_STATE_DIR, STATE_DIR_RELATIVE,
         TYPE1_ENT_PATH, TYPE1_ENT_PATH_STAGED, USER_CFG_STAGED,
     },
-    parsers::bls_config::{BLSConfigType, parse_bls_config},
+    parsers::bls_config::{BLSConfigType, EFIKey, parse_bls_config},
     spec::{BootEntry, BootloaderKind, DeploymentEntry},
     status::Slot,
     store::{BootedComposefs, Storage},
@@ -54,8 +54,11 @@ fn delete_type1_conf_file(
         let bls_config = parse_bls_config(&cfg)?;
 
         match &bls_config.cfg_type {
-            BLSConfigType::EFI { efi } => {
-                if !efi.as_str().contains(&depl.deployment.verity) {
+            BLSConfigType::EFI { key } => {
+                let path = match key {
+                    EFIKey::Efi(path) | EFIKey::Uki(path) => path,
+                };
+                if !path.as_str().contains(&depl.deployment.verity) {
                     continue;
                 }
 

crates/lib/src/bootc_composefs/state.rs

@@ -29,7 +29,7 @@ use crate::bootc_composefs::boot::BootType;
 use crate::bootc_composefs::status::{
     ComposefsCmdline, StagedDeployment, get_sorted_type1_boot_entries,
 };
-use crate::parsers::bls_config::BLSConfigType;
+use crate::parsers::bls_config::{BLSConfigType, EFIKey};
 use crate::store::{BootedComposefs, Storage};
 use crate::{
     composefs_consts::{
@@ -69,8 +69,11 @@ pub(crate) fn get_booted_bls(boot_dir: &Dir, booted_cfs: &BootedComposefs) -> Re
 
     for entry in sorted_entries {
         match &entry.cfg_type {
-            BLSConfigType::EFI { efi } => {
-                if efi.as_str().contains(&*booted_cfs.cmdline.digest) {
+            BLSConfigType::EFI { key } => {
+                let path = match key {
+                    EFIKey::Efi(path) | EFIKey::Uki(path) => path,
+                };
+                if path.as_str().contains(&*booted_cfs.cmdline.digest) {
                     return Ok(entry);
                 }
             }

crates/lib/src/bootc_composefs/status.rs

@@ -22,7 +22,7 @@ use crate::{
     },
     install::EFI_LOADER_INFO,
     parsers::{
-        bls_config::{BLSConfig, BLSConfigType, parse_bls_config},
+        bls_config::{BLSConfig, BLSConfigType, EFIKey, parse_bls_config},
         grub_menuconfig::{MenuEntry, parse_grub_menuentry_file},
     },
     spec::{BootEntry, BootOrder, BootloaderKind, Host, HostSpec, ImageStatus},
@@ -980,8 +980,11 @@ async fn composefs_deployment_status_from(
 
             let is_rollback_queued = match &bls_config.cfg_type {
                 // For UKI boot
-                BLSConfigType::EFI { efi } => {
-                    efi.as_str().contains(booted_composefs_digest.as_ref())
+                BLSConfigType::EFI { key } => {
+                    let path = match key {
+                        EFIKey::Efi(path) | EFIKey::Uki(path) => path,
+                    };
+                    path.as_str().contains(booted_composefs_digest.as_ref())
                 }
 
                 // For boot entry Type1

crates/lib/src/bootloader.rs

@@ -326,7 +326,7 @@ pub(crate) fn install_systemd_boot(
 }
 
 #[context("Querying bootctl version")]
-fn bootctl_systemd_version() -> Result<u32> {
+pub(crate) fn bootctl_systemd_version() -> Result<u32> {
     let out = Command::new("bootctl").arg("--version").run_get_string()?;
     parse_systemd_version(&out)
 }