cli/composefs: Implement status cmd for compoesfs booted system

This is currently WIP, as it only shows the currently booted image in
use and not any staged or rollback deployments.

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

Author: Johan-Liebert1

lib/src/spec.rs

@@ -164,6 +164,15 @@ pub struct BootEntryOstree {
     pub deploy_serial: u32,
 }
 
+
+/// A bootable entry
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, JsonSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct BootEntryComposefs {
+    /// The erofs verity
+    pub verity: String,
+}
+
 /// A bootable entry
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, JsonSchema)]
 #[serde(rename_all = "camelCase")]
@@ -181,6 +190,8 @@ pub struct BootEntry {
     pub store: Option<Store>,
     /// If this boot entry is ostree based, the corresponding state
     pub ostree: Option<BootEntryOstree>,
+    /// If this boot entry is composefs based, the corresponding state
+    pub composefs: Option<BootEntryComposefs>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, JsonSchema)]
@@ -520,6 +531,7 @@ mod tests {
                 pinned: false,
                 store: None,
                 ostree: None,
+                composefs: None,
             }
         }
 

lib/src/status.rs

@@ -10,6 +10,7 @@ use fn_error_context::context;
 use ostree::glib;
 use ostree_container::OstreeImageReference;
 use ostree_ext::container as ostree_container;
+use ostree_ext::container_utils::composefs_booted;
 use ostree_ext::container_utils::ostree_booted;
 use ostree_ext::keyfileext::KeyFileExt;
 use ostree_ext::oci_spec;
@@ -156,6 +157,7 @@ fn boot_entry_from_deployment(
             deploy_serial: deployment.deployserial().try_into().unwrap(),
             stateroot: deployment.stateroot().into(),
         }),
+        composefs: None,
     };
     Ok(r)
 }
@@ -292,13 +294,54 @@ pub(crate) async fn status(opts: super::cli::StatusOpts) -> Result<()> {
         0 | 1 => {}
         o => anyhow::bail!("Unsupported format version: {o}"),
     };
-    let mut host = if !ostree_booted()? {
-        Default::default()
-    } else {
+    let mut host = if ostree_booted()? {
         let sysroot = super::cli::get_storage().await?;
         let booted_deployment = sysroot.booted_deployment();
         let (_deployments, host) = get_status(&sysroot, booted_deployment.as_ref())?;
         host
+    } else if composefs_booted()? {
+        let dir_contents = std::fs::read_dir("/sysroot/composefs/images")?;
+
+        let host_spec = HostSpec {
+            image: Some(ImageReference {
+                image: "".into(),
+                transport: "".into(),
+                signature: None,
+            }),
+            boot_order: BootOrder::Default,
+        };
+
+        let mut host = Host::new(host_spec);
+
+        let cmdline = crate::kernel::parse_cmdline()?;
+        let booted = cmdline.iter().find_map(|x| x.strip_prefix("composefs="));
+
+        let Some(booted) = booted else {
+            anyhow::bail!("Failed to find composefs parameter in kernel cmdline");
+        };
+
+        host.status = HostStatus {
+            staged: None,
+            booted: Some(BootEntry {
+                image: None,
+                cached_update: None,
+                incompatible: false,
+                pinned: false,
+                store: None,
+                ostree: None,
+                composefs: Some(crate::spec::BootEntryComposefs {
+                    verity: booted.into(),
+                }),
+            }),
+            other_deployments: vec![],
+            rollback: None,
+            rollback_queued: false,
+            ty: None,
+        };
+
+        host
+    } else {
+        Default::default()
     };
 
     // We could support querying the staged or rollback deployments
@@ -506,6 +549,27 @@ fn human_render_slot_ostree(
     Ok(())
 }
 
+/// Output a rendering of a non-container composefs boot entry.
+fn human_render_slot_composefs(
+    mut out: impl Write,
+    slot: Slot,
+    entry: &crate::spec::BootEntry,
+    erofs_verity: &str,
+) -> Result<()> {
+    // TODO consider rendering more ostree stuff here like rpm-ostree status does
+    let prefix = match slot {
+        Slot::Staged => "  Staged composefs".into(),
+        Slot::Booted => format!("{} Booted composefs", crate::glyph::Glyph::BlackCircle),
+        Slot::Rollback => "  Rollback composefs".into(),
+    };
+    let prefix_len = prefix.len();
+    writeln!(out, "{prefix}")?;
+    write_row_name(&mut out, "Commit", prefix_len)?;
+    writeln!(out, "{erofs_verity}")?;
+    tracing::debug!("pinned={}", entry.pinned);
+    Ok(())
+}
+
 fn human_readable_output_booted(mut out: impl Write, host: &Host, verbose: bool) -> Result<()> {
     let mut first = true;
     for (slot_name, status) in [
@@ -529,6 +593,8 @@ fn human_readable_output_booted(mut out: impl Write, host: &Host, verbose: bool)
                     &ostree.checksum,
                     verbose,
                 )?;
+            } else if let Some(composefs) = &host_status.composefs {
+                human_render_slot_composefs(&mut out, slot_name, host_status, &composefs.verity)?;
             } else {
                 writeln!(out, "Current {slot_name} state is unknown")?;
             }

ostree-ext/src/container_utils.rs

@@ -77,6 +77,13 @@ pub fn ostree_booted() -> io::Result<bool> {
     Path::new(&format!("/{OSTREE_BOOTED}")).try_exists()
 }
 
+
+/// Returns true if the system appears to have been booted with composefs.
+pub fn composefs_booted() -> io::Result<bool> {
+    let cmdline = std::fs::read_to_string("/proc/cmdline")?;
+    Ok(cmdline.contains("composefs="))
+}
+
 /// Returns true if the target root appears to have been booted via ostree.
 pub fn is_ostree_booted_in(rootfs: &Dir) -> io::Result<bool> {
     rootfs.try_exists(OSTREE_BOOTED)