Add a feature for use of ostree v2025.3

This changes things so if a feature flag is passed then we
require a new enough ostree. Add a wrapper for a bit of
soft reboot state detection.

Signed-off-by: Colin Walters <walters@verbum.org>

Author: jmarrero

Cargo.lock

@@ -72,6 +72,7 @@ install-to-disk = []
 rhsm = []
 # Implementation detail of man page generation.
 docgen = ["clap_mangen"]
+ostree-2025-3 = ["ostree-ext/ostree-2025-3"]
 
 [lints]
 workspace = true

crates/lib/Cargo.toml

@@ -577,6 +577,10 @@ async fn deploy(
                 &opts,
                 Some(cancellable),
             )?;
+            tracing::debug!(
+                "Soft reboot capable: {:?}",
+                ostree_ext::deployment_can_soft_reboot(&sysroot, &d)
+            );
             Ok(d.index())
         }),
     )

crates/lib/src/deploy.rs

@@ -10,7 +10,8 @@ version = "0.15.3"
 [dependencies]
 containers-image-proxy = "0.8.0"
 # We re-export this library too.
-ostree = { features = ["v2025_2"], version = "0.20" }
+# Default to v2025_2, upgrade to v2025_3 when feature is enabled
+ostree = { version = "0.20", features = ["v2025_2"] }
 
 # Private dependencies
 anyhow = { workspace = true }
@@ -65,6 +66,7 @@ features = ["dox"]
 docgen = ["clap_mangen"]
 dox = ["ostree/dox"]
 internal-testing-api = ["xshell", "indoc", "similar-asserts"]
+ostree-2025-3 = ["ostree/v2025_3"]
 # Enable calling back into bootc
 bootc = []
 

crates/ostree-ext/Cargo.toml

@@ -78,3 +78,20 @@ pub mod prelude {
 pub mod fixture;
 #[cfg(feature = "internal-testing-api")]
 pub mod integrationtest;
+
+/// Dynamic detection wrapper for soft reboots, if the installed ostree is too old
+/// then we return `None`.
+pub fn deployment_can_soft_reboot(
+    sysroot: &ostree::Sysroot,
+    deployment: &ostree::Deployment,
+) -> Option<bool> {
+    #[cfg(feature = "ostree-2025-3")]
+    {
+        Some(sysroot.deployment_can_soft_reboot(deployment))
+    }
+    #[cfg(not(feature = "ostree-2025-3"))]
+    {
+        let _ = (sysroot, deployment);
+        None
+    }
+}