composefs-backend: Fix bootc status for systemd-boot

Signed-off-by: Pragyan Poudyal <[email protected]>

Author: Johan-Liebert1

crates/lib/src/bootc_composefs/rollback.rs

@@ -8,7 +8,7 @@ use fn_error_context::context;
 use rustix::fs::{fsync, renameat_with, AtFlags, RenameFlags};
 
 use crate::bootc_composefs::boot::BootType;
-use crate::bootc_composefs::status::{composefs_deployment_status, get_sorted_bls_boot_entries};
+use crate::bootc_composefs::status::{composefs_deployment_status, get_sorted_type1_boot_entries};
 use crate::{
     bootc_composefs::{boot::get_efi_uuid_source, status::get_sorted_uki_boot_entries},
     composefs_consts::{
@@ -110,7 +110,7 @@ pub(crate) fn rollback_composefs_bls() -> Result<()> {
     // After this:
     // all_configs[0] -> booted depl
     // all_configs[1] -> rollback depl
-    let mut all_configs = get_sorted_bls_boot_entries(&boot_dir, false)?;
+    let mut all_configs = get_sorted_type1_boot_entries(&boot_dir, false)?;
 
     // Update the indicies so that they're swapped
     for (idx, cfg) in all_configs.iter_mut().enumerate() {

crates/lib/src/bootc_composefs/status.rs

@@ -7,7 +7,7 @@ use fn_error_context::context;
 
 use crate::{
     bootc_composefs::boot::{get_esp_partition, get_sysroot_parent_dev, BootType},
-    composefs_consts::{BOOT_LOADER_ENTRIES, COMPOSEFS_CMDLINE, USER_CFG},
+    composefs_consts::{COMPOSEFS_CMDLINE, TYPE1_ENT_PATH, USER_CFG},
     parsers::{
         bls_config::{parse_bls_config, BLSConfig, BLSConfigType},
         grub_menuconfig::{parse_grub_menuentry_file, MenuEntry},
@@ -91,14 +91,14 @@ pub(crate) fn get_sorted_uki_boot_entries<'a>(
     parse_grub_menuentry_file(str)
 }
 
-#[context("Getting sorted BLS entries")]
-pub(crate) fn get_sorted_bls_boot_entries(
+#[context("Getting sorted Type1 boot entries")]
+pub(crate) fn get_sorted_type1_boot_entries(
     boot_dir: &Dir,
     ascending: bool,
 ) -> Result<Vec<BLSConfig>> {
     let mut all_configs = vec![];
 
-    for entry in boot_dir.read_dir(format!("loader/{BOOT_LOADER_ENTRIES}"))? {
+    for entry in boot_dir.read_dir(TYPE1_ENT_PATH)? {
         let entry = entry?;
 
         let file_name = entry.file_name();
@@ -374,41 +374,63 @@ pub(crate) async fn composefs_deployment_status() -> Result<Host> {
         }
     };
 
-    match boot_type {
-        BootType::Bls => {
-            let bls_config = get_sorted_bls_boot_entries(&boot_dir, false)?;
-            let bls_config = bls_config
-                .first()
-                .ok_or(anyhow::anyhow!("First boot entry not found"))?;
-
-            match &bls_config.cfg_type {
-                BLSConfigType::EFI { efi } => {
-                    host.status.rollback_queued = efi.contains(composefs_digest.as_ref());
-                }
+    let is_rollback_queued = match booted.bootloader {
+        Bootloader::Grub => match boot_type {
+            BootType::Bls => {
+                let bls_config = get_sorted_type1_boot_entries(&boot_dir, false)?;
+                let bls_config = bls_config
+                    .first()
+                    .ok_or(anyhow::anyhow!("First boot entry not found"))?;
 
-                BLSConfigType::NonEFI { options, .. } => {
-                    host.status.rollback_queued = !options
+                match &bls_config.cfg_type {
+                    BLSConfigType::NonEFI { options, .. } => !options
                         .as_ref()
                         .ok_or(anyhow::anyhow!("options key not found in bls config"))?
-                        .contains(composefs_digest.as_ref());
+                        .contains(composefs_digest.as_ref()),
+
+                    BLSConfigType::EFI { .. } => {
+                        anyhow::bail!("Found 'efi' field in Type1 boot entry")
+                    }
+                    BLSConfigType::Unknown => anyhow::bail!("Unknown BLS Config Type"),
                 }
+            }
 
-                BLSConfigType::Unknown => todo!(),
-            };
-        }
+            BootType::Uki => {
+                let mut s = String::new();
 
-        BootType::Uki => {
-            let mut s = String::new();
+                !get_sorted_uki_boot_entries(&boot_dir, &mut s)?
+                    .first()
+                    .ok_or(anyhow::anyhow!("First boot entry not found"))?
+                    .body
+                    .chainloader
+                    .contains(composefs_digest.as_ref())
+            }
+        },
 
-            host.status.rollback_queued = !get_sorted_uki_boot_entries(&boot_dir, &mut s)?
+        // We will have BLS stuff and the UKI stuff in the same DIR
+        Bootloader::Systemd => {
+            let bls_config = get_sorted_type1_boot_entries(&boot_dir, false)?;
+            let bls_config = bls_config
                 .first()
-                .ok_or(anyhow::anyhow!("First boot entry not found"))?
-                .body
-                .chainloader
-                .contains(composefs_digest.as_ref())
+                .ok_or(anyhow::anyhow!("First boot entry not found"))?;
+
+            match &bls_config.cfg_type {
+                // For UKI boot
+                BLSConfigType::EFI { efi } => efi.contains(composefs_digest.as_ref()),
+
+                // For boot entry Type1
+                BLSConfigType::NonEFI { options, .. } => !options
+                    .as_ref()
+                    .ok_or(anyhow::anyhow!("options key not found in bls config"))?
+                    .contains(composefs_digest.as_ref()),
+
+                BLSConfigType::Unknown => anyhow::bail!("Unknown BLS Config Type"),
+            }
         }
     };
 
+    host.status.rollback_queued = is_rollback_queued;
+
     if host.status.rollback_queued {
         host.spec.boot_order = BootOrder::Rollback
     };
@@ -465,7 +487,7 @@ mod tests {
         tempdir.atomic_write("loader/entries/entry1.conf", entry1)?;
         tempdir.atomic_write("loader/entries/entry2.conf", entry2)?;
 
-        let result = get_sorted_bls_boot_entries(&tempdir, true).unwrap();
+        let result = get_sorted_type1_boot_entries(&tempdir, true).unwrap();
 
         let mut config1 = BLSConfig::default();
         config1.title = Some("Fedora 42.20250623.3.1 (CoreOS)".into());
@@ -488,7 +510,7 @@ mod tests {
         assert_eq!(result[0].sort_key.as_ref().unwrap(), "1");
         assert_eq!(result[1].sort_key.as_ref().unwrap(), "2");
 
-        let result = get_sorted_bls_boot_entries(&tempdir, false).unwrap();
+        let result = get_sorted_type1_boot_entries(&tempdir, false).unwrap();
         assert_eq!(result[0].sort_key.as_ref().unwrap(), "2");
         assert_eq!(result[1].sort_key.as_ref().unwrap(), "1");