composefs-backend: Start finalize-staged service on update/switch

Signed-off-by: Pragyan Poudyal <[email protected]>

Author: Johan-Liebert1

crates/lib/src/bootc_composefs/mod.rs

@@ -2,6 +2,7 @@ pub(crate) mod boot;
 pub(crate) mod finalize;
 pub(crate) mod repo;
 pub(crate) mod rollback;
+pub(crate) mod service;
 pub(crate) mod state;
 pub(crate) mod status;
 pub(crate) mod switch;

crates/lib/src/bootc_composefs/repo.rs

@@ -95,7 +95,7 @@ pub(crate) async fn pull_composefs_repo(
         .await
         .context("Pulling composefs repo")?;
 
-    tracing::info!("id: {}, verity: {}", hex::encode(id), verity.to_hex());
+    tracing::info!("ID: {}, Verity: {}", hex::encode(id), verity.to_hex());
 
     let repo = open_composefs_repo(&rootfs_dir)?;
     let mut fs = create_composefs_filesystem(&repo, &hex::encode(id), None)

crates/lib/src/bootc_composefs/service.rs

@@ -0,0 +1,22 @@
+use anyhow::{Context, Result};
+use fn_error_context::context;
+use std::process::Command;
+
+use crate::composefs_consts::COMPOSEFS_FINALIZE_STAGED_SERVICE;
+
+/// Starts the finaize staged service which will "unstage" the deployment
+/// This is called before an upgrade or switch operation, as these create a staged
+/// deployment
+#[context("Starting finalize staged service")]
+pub(crate) fn start_finalize_stated_svc() -> Result<()> {
+    let cmd_status = Command::new("systemctl")
+        .args(["start", "--quiet", COMPOSEFS_FINALIZE_STAGED_SERVICE])
+        .status()
+        .context("Starting finalize service")?;
+
+    if !cmd_status.success() {
+        anyhow::bail!("systemctl exited with status {cmd_status}")
+    }
+
+    Ok(())
+}

crates/lib/src/bootc_composefs/switch.rs

@@ -6,6 +6,7 @@ use crate::{
     bootc_composefs::{
         boot::{setup_composefs_bls_boot, setup_composefs_uki_boot, BootSetupType, BootType},
         repo::pull_composefs_repo,
+        service::start_finalize_stated_svc,
         state::write_composefs_state,
         status::composefs_deployment_status,
     },
@@ -36,6 +37,8 @@ pub(crate) async fn switch_composefs(opts: SwitchOpts) -> Result<()> {
         anyhow::bail!("Target image is undefined")
     };
 
+    start_finalize_stated_svc()?;
+
     let (repo, entries, id, fs) =
         pull_composefs_repo(&target_imgref.transport, &target_imgref.image).await?;
 

crates/lib/src/bootc_composefs/update.rs

@@ -6,6 +6,7 @@ use crate::{
     bootc_composefs::{
         boot::{setup_composefs_bls_boot, setup_composefs_uki_boot, BootSetupType, BootType},
         repo::pull_composefs_repo,
+        service::start_finalize_stated_svc,
         state::write_composefs_state,
         status::composefs_deployment_status,
     },
@@ -14,12 +15,12 @@ use crate::{
 
 #[context("Upgrading composefs")]
 pub(crate) async fn upgrade_composefs(_opts: UpgradeOpts) -> Result<()> {
-    // TODO: IMPORTANT Have all the checks here that `bootc upgrade` has for an ostree booted system
-
     let host = composefs_deployment_status()
         .await
         .context("Getting composefs deployment status")?;
 
+    start_finalize_stated_svc()?;
+
     // TODO: IMPORTANT We need to check if any deployment is staged and get the image from that
     let imgref = host
         .spec

crates/lib/src/composefs_consts.rs

@@ -36,3 +36,5 @@ pub(crate) const USER_CFG_STAGED: &str = "user.cfg.staged";
 /// This is relative to the boot/efi directory
 pub(crate) const TYPE1_ENT_PATH: &str = "loader/entries";
 pub(crate) const TYPE1_ENT_PATH_STAGED: &str = "loader/entries.staged";
+
+pub(crate) const COMPOSEFS_FINALIZE_STAGED_SERVICE: &str = "composefs-finalize-staged.service";