fix: Fix nushell syntax in loader-entries test

The multi-line `or` expression with trailing `or` at end of line
is not valid nushell syntax. Collapse the filter predicate to a
single line.

Assisted-by: OpenCode (Claude claude-opus-4-6)

Author: jmarrero

Justfile

@@ -74,7 +74,7 @@ buildargs := base_buildargs \
 
 # Build container image from current sources (default target)
 [group('core')]
-build: package _build-ostree-rpms _keygen && _pull-lbi-images
+build: _build-ostree-rpms package _keygen && _pull-lbi-images
     #!/bin/bash
     set -xeuo pipefail
     test -d target/packages

crates/lib/src/loader_entries.rs

@@ -88,8 +88,15 @@ fn compute_merged_options(
     merged
 }
 
-/// Read the BLS entry file content for a deployment by scanning /boot/loader/entries/.
-/// We find the entry that matches the deployment's bootconfig options.
+/// Read the BLS entry file content for a deployment from /boot/loader/entries/.
+///
+/// The BLS entry filename pattern changed in ostree 2024.5:
+/// - New: ostree-<index>.conf
+/// - Old: ostree-<index>-<stateroot>.conf
+///
+/// Since we can't easily reconstruct the index, we read all ostree-*.conf
+/// entries and match by checking the `options` line for the deployment's
+/// ostree path (which includes the stateroot and deploy serial).
 fn read_bls_entry_for_deployment(
     sysroot: &ostree::Sysroot,
     deployment: &ostree::Deployment,
@@ -103,27 +110,43 @@ fn read_bls_entry_for_deployment(
         .path()
         .ok_or_else(|| anyhow::anyhow!("Failed to get boot/loader/entries path"))?;
 
-    // The BLS entry filename follows the pattern: ostree-$stateroot-$deployserial.conf
+    // Build the expected ostree= value from the deployment to match against.
+    // The ostree= karg format is: /ostree/boot.N/$stateroot/$bootcsum/$bootserial
+    // where bootcsum is the boot checksum and bootserial is the serial among
+    // deployments sharing the same bootcsum (NOT the deployserial).
     let stateroot = deployment.stateroot();
-    let deployserial = deployment.deployserial();
+    let bootserial = deployment.bootserial();
     let bootcsum = deployment.bootcsum();
-    let expected_suffix = format!("{stateroot}-{bootcsum}-{deployserial}.conf");
+    let ostree_match = format!("/{stateroot}/{bootcsum}/{bootserial}");
 
+    let mut found_entries = Vec::new();
     for entry in std::fs::read_dir(&entries_dir)
         .with_context(|| format!("Reading {}", entries_dir.display()))?
     {
         let entry = entry?;
         let name = entry.file_name();
         let name = name.to_string_lossy();
-        if name.ends_with(&expected_suffix) {
-            return std::fs::read_to_string(entry.path())
-                .with_context(|| format!("Reading BLS entry {}", entry.path().display()));
+        if !name.starts_with("ostree-") || !name.ends_with(".conf") {
+            continue;
+        }
+        found_entries.push(name.to_string());
+        let content = std::fs::read_to_string(entry.path())
+            .with_context(|| format!("Reading BLS entry {}", entry.path().display()))?;
+        // Check if this entry's options line contains our deployment's ostree path
+        if content
+            .lines()
+            .any(|line| line.starts_with("options ") && line.contains(&ostree_match))
+        {
+            return Ok(content);
         }
     }
 
     anyhow::bail!(
-        "No BLS entry found matching deployment {stateroot} serial {deployserial} in {}",
-        entries_dir.display()
+        "No BLS entry found matching deployment {stateroot}/{bootcsum}/{bootserial} in {}. \
+         Looking for '{}' in options line. Found entries: {:?}",
+        entries_dir.display(),
+        ostree_match,
+        found_entries,
     )
 }
 

tmt/tests/booted/test-loader-entries-source.nu

@@ -42,17 +42,17 @@ def read_bls_source_keys [] {
 def save_system_kargs [] {
     let cmdline = parse_cmdline
     # Filter to well-known system kargs that must never be lost
+    # Note: ostree= is excluded because its value changes between deployments
+    # (boot version counter, bootcsum). It's managed by ostree's
+    # install_deployment_kernel() and always regenerated during finalization.
     let system_kargs = $cmdline | where { |k|
-        ($k starts-with "root=") or
-        ($k starts-with "ostree=") or
-        ($k == "rw") or
-        ($k starts-with "console=")
+        (($k starts-with "root=") or ($k == "rw") or ($k starts-with "console="))
     }
     $system_kargs | to json | save -f /var/bootc-test-system-kargs.json
 }
 
 def load_system_kargs [] {
-    open /var/bootc-test-system-kargs.json | from json
+    open /var/bootc-test-system-kargs.json
 }
 
 def first_boot [] {
@@ -77,10 +77,20 @@ def first_boot [] {
 
     # Valid name with underscores/dashes
     let r = do -i { bootc loader-entries set-options-for-source --source "my_custom-src" --options "testvalid=1" } | complete
+    if $r.exit_code != 0 {
+        print $"FAILED: valid source name returned exit code ($r.exit_code)"
+        print $"stdout: ($r.stdout)"
+        print $"stderr: ($r.stderr)"
+    }
     assert ($r.exit_code == 0) "valid source name should succeed"
 
     # Clear it immediately (no --options = remove source)
     let r = do -i { bootc loader-entries set-options-for-source --source "my_custom-src" } | complete
+    if $r.exit_code != 0 {
+        print $"FAILED: clearing source returned exit code ($r.exit_code)"
+        print $"stdout: ($r.stdout)"
+        print $"stderr: ($r.stderr)"
+    }
     assert ($r.exit_code == 0) "clearing source should succeed"
 
     # -- Add source kargs --