Filter out BLS entries not managed by bootc

Author: Dudecake

crates/lib/src/bootc_composefs/status.rs

@@ -19,6 +19,7 @@ use crate::{
     composefs_consts::{
         COMPOSEFS_CMDLINE, ORIGIN_KEY_BOOT_DIGEST, ORIGIN_KEY_IMAGE, ORIGIN_KEY_MANIFEST_DIGEST,
         TYPE1_ENT_PATH, TYPE1_ENT_PATH_STAGED, USER_CFG, USER_CFG_STAGED,
+        BLS_ENTRY_PREFIX,
     },
     install::EFI_LOADER_INFO,
     parsers::{
@@ -304,7 +305,7 @@ fn get_sorted_type1_boot_entries_helper(
             .to_str()
             .ok_or(anyhow::anyhow!("Found non UTF-8 characters in filename"))?;
 
-        if !file_name.ends_with(".conf") {
+        if !(file_name.starts_with(BLS_ENTRY_PREFIX) && file_name.ends_with(".conf")) {
             continue;
         }
 
@@ -1109,8 +1110,16 @@ mod tests {
             "loader/entries/random_file.txt",
             "Random file that we won't parse",
         )?;
-        tempdir.atomic_write("loader/entries/entry1.conf", entry1)?;
-        tempdir.atomic_write("loader/entries/entry2.conf", entry2)?;
+        tempdir.atomic_write(
+            "loader/entries/random_file.conf",
+            "Random file that we won't parse",
+        )?;
+        tempdir.atomic_write(
+            "loader/entries/bootc_random_file.txt",
+            "Random file that we won't parse",
+        )?;
+        tempdir.atomic_write("loader/entries/bootc_entry1.conf", entry1)?;
+        tempdir.atomic_write("loader/entries/bootc_entry2.conf", entry2)?;
 
         let result =
             get_sorted_type1_boot_entries_helper(&tempdir, true, false, Bootloader::Systemd)
@@ -1272,8 +1281,8 @@ mod tests {
 
         tempdir.create_dir_all("loader/entries")?;
         tempdir.create_dir_all("loader/entries.staged")?;
-        tempdir.atomic_write("loader/entries/active.conf", active_entry)?;
-        tempdir.atomic_write("loader/entries.staged/staged.conf", staged_entry)?;
+        tempdir.atomic_write("loader/entries/bootc_active.conf", active_entry)?;
+        tempdir.atomic_write("loader/entries.staged/bootc_staged.conf", staged_entry)?;
 
         let result = list_type1_entries(&tempdir)?;
         assert_eq!(result.len(), 2);
@@ -1310,7 +1319,7 @@ mod tests {
 
         let entry2 = format!(
             r#"
-            title Fedora Linux (2.0.0) 
+            title Fedora Linux (2.0.0)
             version 2.0.0
             sort-key {}
             linux /boot/vmlinuz

crates/lib/src/composefs_consts.rs

@@ -48,6 +48,9 @@ pub(crate) const TYPE1_BOOT_DIR_PREFIX: &str = "bootc_composefs-";
 /// The prefix for names of UKI and UKI Addons
 pub(crate) const UKI_NAME_PREFIX: &str = TYPE1_BOOT_DIR_PREFIX;
 
+/// The prefix for BLS file entries
+pub(crate) const BLS_ENTRY_PREFIX: &str = "bootc_";
+
 /// Prefix for OCI tags owned by bootc in the composefs repository.
 ///
 /// Tags are created as `localhost/bootc-<manifest_digest>` to act as GC roots

tmt/tests/booted/test-composefs-corruped-state-resilience.nu

@@ -41,9 +41,9 @@ def first_boot [] {
     systemd-run -p MountFlags=slave -qdPG -- /bin/sh -c $"
         mount -orw,remount /sysroot
         cd ($entries_dir)
-        cp * new-entry.conf
-        
-        sed -i 's;($booted_verity);bad-verity;' new-entry.conf
+        cp * bootc_new-entry.conf
+
+        sed -i 's;($booted_verity);bad-verity;' bootc_new-entry.conf
     "
 
     # This should work but log a warning in journal
@@ -76,8 +76,8 @@ def first_boot [] {
 # Test the same thing but with an existing rollback deployment
 def second_boot [] {
     assert equal $booted.image.image "localhost/bootc-test-1"
-    
-    # Create another derived image  
+
+    # Create another derived image
     tap make_uki_containerfile $"
         FROM localhost/bootc as base
         RUN echo 'second-deployment' > /usr/share/deployment-marker