start moving to systemd service model

Author: jmarrero

crates/lib/src/cli.rs

@@ -485,6 +485,8 @@ pub(crate) enum InternalsOpts {
     /// Initiate a reboot the same way we would after --apply; intended
     /// primarily for testing.
     Reboot,
+    /// Check if soft reboot should be performed and prepare if needed
+    PrepareSoftReboot,
     #[cfg(feature = "rhsm")]
     /// Publish subscription-manager facts to /etc/rhsm/facts/bootc.facts
     PublishRhsmFacts,
@@ -738,7 +740,40 @@ fn can_perform_soft_reboot(deployment: Option<&crate::spec::BootEntry>) -> bool
     deployment.map(|d| d.soft_reboot_capable).unwrap_or(false)
 }
 
-/// Prepare and execute a soft reboot for the given deployment
+/// 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>,
+) -> Result<bool> {
+    // Get updated status to check for soft-reboot capability
+    let (_deployments, updated_host) = crate::status::get_status(sysroot, booted_deployment)?;
+
+    // Check if there's a staged deployment that can perform soft reboot
+    if can_perform_soft_reboot(updated_host.status.staged.as_ref()) {
+        soft_reboot_staged(sysroot)?;
+        return Ok(true);
+    }
+
+    //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 a soft reboot for the given deployment
 #[context("Preparing soft reboot")]
 fn prepare_soft_reboot(
     sysroot: &crate::store::Storage,
@@ -887,9 +922,6 @@ async fn upgrade(opts: UpgradeOpts) -> Result<()> {
             println!("Staged update present, not changed.");
 
             if opts.apply {
-                if can_perform_soft_reboot(host.status.staged.as_ref()) {
-                    soft_reboot_staged(sysroot)?;
-                }
                 crate::reboot::reboot()?;
             }
         } else if booted_unchanged {
@@ -986,12 +1018,6 @@ async fn switch(opts: SwitchOpts) -> Result<()> {
     sysroot.update_mtime()?;
 
     if opts.apply {
-        // Get updated status to check for soft-reboot capability
-        let updated_host = crate::status::get_status(sysroot, Some(&booted_deployment))?.1;
-
-        if can_perform_soft_reboot(updated_host.status.staged.as_ref()) {
-            soft_reboot_staged(sysroot)?;
-        }
         crate::reboot::reboot()?;
     }
 
@@ -1005,20 +1031,6 @@ async fn rollback(opts: RollbackOpts) -> Result<()> {
     crate::deploy::rollback(sysroot).await?;
 
     if opts.apply {
-        // Get status before rollback to check soft-reboot capability
-        let host = crate::status::get_status_require_booted(sysroot)?.2;
-
-        if can_perform_soft_reboot(host.status.rollback.as_ref()) {
-            println!("Rollback deployment is soft-reboot capable, performing 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)?;
-        }
-
         crate::reboot::reboot()?;
     }
 
@@ -1302,6 +1314,17 @@ async fn run_from_opt(opt: Opt) -> Result<()> {
                 }
             },
             InternalsOpts::Reboot => crate::reboot::reboot(),
+            InternalsOpts::PrepareSoftReboot => {
+                let sysroot = &get_storage().await?;
+                let booted_deployment = sysroot.booted_deployment();
+                let should_perform = should_soft_reboot(sysroot, booted_deployment.as_ref())?;
+                if should_perform {
+                    println!("Soft reboot preparation completed");
+                } else {
+                    println!("Soft reboot not needed");
+                }
+                Ok(())
+            }
             InternalsOpts::Fsck => {
                 let sysroot = &get_storage().await?;
                 crate::fsck::fsck(&sysroot, std::io::stdout().lock()).await?;

crates/lib/src/status.rs

@@ -467,6 +467,18 @@ fn human_render_slot(
                 }
             }
         }
+
+        // Show soft-reboot capability
+        write_row_name(&mut out, "Soft-reboot", prefix_len)?;
+        writeln!(
+            out,
+            "{}",
+            if entry.soft_reboot_capable {
+                "yes"
+            } else {
+                "no"
+            }
+        )?;
     }
 
     tracing::debug!("pinned={}", entry.pinned);
@@ -504,6 +516,18 @@ fn human_render_slot_ostree(
         if let Some(ostree) = &entry.ostree {
             render_verbose_ostree_info(&mut out, ostree, slot, prefix_len)?;
         }
+
+        // Show soft-reboot capability
+        write_row_name(&mut out, "Soft-reboot", prefix_len)?;
+        writeln!(
+            out,
+            "{}",
+            if entry.soft_reboot_capable {
+                "yes"
+            } else {
+                "no"
+            }
+        )?;
     }
 
     tracing::debug!("pinned={}", entry.pinned);
@@ -725,5 +749,6 @@ mod tests {
         assert!(w.contains("Deploy serial:"));
         assert!(w.contains("Staged:"));
         assert!(w.contains("Commit:"));
+        assert!(w.contains("Soft-reboot:"));
     }
 }

systemd/bootc-soft-reboot.service

@@ -0,0 +1,17 @@
+[Unit]
+Description=bootc soft reboot preparation
+Documentation=man:bootc(8)
+ConditionPathExists=/run/ostree-booted
+DefaultDependencies=no
+Before=reboot.target soft-reboot.target ostree-finalize-staged.service
+Conflicts=reboot.target soft-reboot.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/bin/true
+ExecStop=/usr/bin/bootc internals prepare-soft-reboot
+TimeoutStopSec=5m
+
+[Install]
+WantedBy=multi-user.target