composefs: Don't soft-reboot automatically

Aligning with ostree API, now we only initiate soft-reboot if `--apply`
is passed to `bootc update`, `bootc switch`, else we only prepare the
soft reboot

Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>

Author: Johan-Liebert1

crates/lib/src/bootc_composefs/soft_reboot.rs

@@ -2,6 +2,7 @@ use crate::{
     bootc_composefs::{
         service::start_finalize_stated_svc, status::composefs_deployment_status_from,
     },
+    cli::SoftRebootMode,
     composefs_consts::COMPOSEFS_CMDLINE,
     store::{BootedComposefs, Storage},
 };
@@ -21,7 +22,7 @@ use std::{fs::create_dir_all, os::unix::process::CommandExt, path::PathBuf, proc
 const NEXTROOT: &str = "/run/nextroot";
 
 #[context("Resetting soft reboot state")]
-fn reset_soft_reboot() -> Result<()> {
+pub(crate) fn reset_soft_reboot() -> Result<()> {
     let run = Utf8Path::new("/run");
     bind_mount_from_pidns(PID1, &run, &run, true).context("Bind mounting /run")?;
 
@@ -61,17 +62,13 @@ pub(crate) async fn prepare_soft_reboot_composefs(
     storage: &Storage,
     booted_cfs: &BootedComposefs,
     deployment_id: Option<&String>,
+    soft_reboot_mode: SoftRebootMode,
     reboot: bool,
-    reset: bool,
 ) -> Result<()> {
     if !systemd_has_soft_reboot() {
         anyhow::bail!("System does not support soft reboots")
     }
 
-    if reset {
-        return reset_soft_reboot();
-    }
-
     let deployment_id = deployment_id.ok_or_else(|| anyhow::anyhow!("Expected deployment id"))?;
 
     if *deployment_id == *booted_cfs.cmdline.digest {
@@ -89,7 +86,13 @@ pub(crate) async fn prepare_soft_reboot_composefs(
         .ok_or_else(|| anyhow::anyhow!("Deployment '{deployment_id}' not found"))?;
 
     if !requred_deployment.soft_reboot_capable {
-        anyhow::bail!("Cannot soft-reboot to deployment with a different kernel state");
+        match soft_reboot_mode {
+            SoftRebootMode::Required => {
+                anyhow::bail!("Cannot soft-reboot to deployment with a different kernel state")
+            }
+
+            SoftRebootMode::Auto => return Ok(()),
+        }
     }
 
     start_finalize_stated_svc()?;

crates/lib/src/bootc_composefs/update.rs

@@ -262,14 +262,21 @@ pub(crate) async fn do_upgrade(
     )
     .await?;
 
+    if let Some(soft_reboot_mode) = opts.soft_reboot {
+        return prepare_soft_reboot_composefs(
+            storage,
+            booted_cfs,
+            Some(&id.to_hex()),
+            soft_reboot_mode,
+            opts.apply,
+        )
+        .await;
+    };
+
     if opts.apply {
         return crate::reboot::reboot();
     }
 
-    if opts.soft_reboot.is_some() {
-        prepare_soft_reboot_composefs(storage, booted_cfs, Some(&id.to_hex()), true, false).await?;
-    }
-
     Ok(())
 }
 

crates/lib/src/cli.rs

@@ -34,7 +34,7 @@ use schemars::schema_for;
 use serde::{Deserialize, Serialize};
 
 use crate::bootc_composefs::delete::delete_composefs_deployment;
-use crate::bootc_composefs::soft_reboot::prepare_soft_reboot_composefs;
+use crate::bootc_composefs::soft_reboot::{prepare_soft_reboot_composefs, reset_soft_reboot};
 use crate::bootc_composefs::{
     digest::{compute_composefs_digest, new_temp_composefs_repo},
     finalize::{composefs_backend_finalize, get_etc_diff},
@@ -624,7 +624,6 @@ pub(crate) enum InternalsOpts {
         reboot: bool,
         #[clap(long, conflicts_with = "reboot")]
         reset: bool,
-        reboot: bool,
     },
 }
 
@@ -1850,13 +1849,18 @@ async fn run_from_opt(opt: Opt) -> Result<()> {
                         // TODO: Call ostree implementation?
                         anyhow::bail!("soft-reboot only implemented for composefs")
                     }
+
                     BootedStorageKind::Composefs(booted_cfs) => {
+                        if reset {
+                            return reset_soft_reboot();
+                        }
+
                         prepare_soft_reboot_composefs(
                             &storage,
                             &booted_cfs,
                             deployment.as_ref(),
+                            SoftRebootMode::Required,
                             reboot,
-                            reset,
                         )
                         .await
                     }