reset: Mark reset deployment dir with .bootc-factory-reset

This is currently used to signal to `bootc status` that the deployment
is a factory reset and doesn't support soft reboot. Otherwise, the soft
reboot code will throw an exception due to mismatched kargs.

Signed-off-by: ckyrouac <[email protected]>

Author: ckyrouac

crates/lib/src/deploy.rs

@@ -634,6 +634,18 @@ async fn deploy(
     let ostree = sysroot.get_ostree()?;
     let staged = ostree.staged_deployment().unwrap();
     assert_eq!(staged.index(), r);
+
+    // This file is used to signal to other CLI commands that this deployment is a factory reset
+    // (e.g. bootc status)
+    if matches!(from, MergeState::Reset { .. }) {
+        let deployment_dir = ostree.deployment_dirpath(&staged);
+        let deployment_dir = std::path::Path::new(deployment_dir.as_str());
+        if deployment_dir.exists() {
+            let marker_path = deployment_dir.join(".bootc-factory-reset");
+            std::fs::write(&marker_path, b"")?;
+        }
+    }
+
     Ok(staged)
 }
 

crates/lib/src/status.rs

@@ -95,7 +95,20 @@ impl From<ImageReference> for OstreeImageReference {
 
 /// Check if a deployment has soft reboot capability
 fn has_soft_reboot_capability(sysroot: &SysrootLock, deployment: &ostree::Deployment) -> bool {
-    ostree_ext::systemd_has_soft_reboot() && sysroot.deployment_can_soft_reboot(deployment)
+    let deployment_dir = sysroot.deployment_dirpath(deployment);
+    let deployment_dir = std::path::Path::new(deployment_dir.as_str());
+    let is_factory_reset =
+        deployment_dir.exists() && deployment_dir.join(".bootc-factory-reset").exists();
+
+    if is_factory_reset {
+        // Factory reset deployments don't support soft reboots
+        // this is primarily because the kargs validation will fail when checking for soft reboot
+        // compatibility in the ostree code, which will cause bootc status and upgrade to fail.
+        // (see ostree_sysroot_deployment_can_soft_reboot in ostree)
+        false
+    } else {
+        ostree_ext::systemd_has_soft_reboot() && sysroot.deployment_can_soft_reboot(deployment)
+    }
 }
 
 /// Parse an ostree origin file (a keyfile) and extract the targeted

crates/ostree-ext/src/container/deploy.rs

@@ -1,6 +1,5 @@
 //! Perform initial setup for a container image based system root
 
-#[cfg(feature = "bootc")]
 use anyhow::Result;
 use fn_error_context::context;
 use ostree::glib;