Check if we are trying to Rollback

Author: jmarrero

crates/lib/src/cli.rs

@@ -740,8 +740,7 @@ fn can_perform_soft_reboot(deployment: Option<&crate::spec::BootEntry>) -> bool
     deployment.map(|d| d.soft_reboot_capable).unwrap_or(false)
 }
 
-/// If there is staged deployment, check if soft reboot is possible and perform it if possible and return true
-/// else return false
+/// If there is staged deployment, check if soft reboot is possible and prepare the system for it
 fn should_soft_reboot(
     sysroot: &crate::store::Storage,
     booted_deployment: Option<&ostree::Deployment>,
@@ -754,12 +753,27 @@ fn should_soft_reboot(
         soft_reboot_staged(sysroot)?;
         return Ok(true);
     }
-    // TODO check if this reboot is doing a rollback...
-    // TODO then perform a soft reboot for the rollback deployment
+
+    //Check if we are trying to rollback
+    //Then prepare for soft reboot for the rollback deployment
+    let host = crate::status::get_status_require_booted(sysroot)?.2;
+    if host.spec.boot_order == crate::spec::BootOrder::Rollback {
+        if can_perform_soft_reboot(host.status.rollback.as_ref()) {
+            println!("Rollback deployment is soft-reboot capable, preparing for soft-reboot...");
+
+            let deployments_list = sysroot.deployments();
+            let target_deployment = deployments_list
+                .first()
+                .ok_or_else(|| anyhow::anyhow!("No deployments found after rollback"))?;
+
+            prepare_soft_reboot(sysroot, target_deployment)?;
+            return Ok(true);
+        }
+    }
     Ok(false)
 }
 
-/// Prepare and execute a soft reboot for the given deployment
+/// Prepare a soft reboot for the given deployment
 #[context("Preparing soft reboot")]
 fn prepare_soft_reboot(
     sysroot: &crate::store::Storage,

systemd/bootc-soft-reboot.service

@@ -3,8 +3,8 @@ Description=bootc soft reboot preparation
 Documentation=man:bootc(8)
 ConditionPathExists=/run/ostree-booted
 DefaultDependencies=no
-Before=ostree-finalize-staged.service final.target
-Conflicts=final.target
+Before=reboot.target soft-reboot.target ostree-finalize-staged.service
+Conflicts=reboot.target soft-reboot.target
 
 [Service]
 Type=oneshot
@@ -14,4 +14,4 @@ ExecStop=/usr/bin/bootc internals prepare-soft-reboot
 TimeoutStopSec=5m
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target