Colin's wip

Author: jmarrero

lib/src/spec.rs

@@ -176,6 +176,9 @@ pub struct BootEntry {
     pub incompatible: bool,
     /// Whether this entry will be subject to garbage collection
     pub pinned: bool,
+    /// This is true if (relative to the booted system) this is a possible target for a soft reboot
+    #[serde(default)]
+    pub soft_reboot_capable: bool,
     /// The container storage backend
     #[serde(default)]
     pub store: Option<Store>,
@@ -517,6 +520,7 @@ mod tests {
                 image: None,
                 cached_update: None,
                 incompatible: false,
+                soft_reboot_capable: false,
                 pinned: false,
                 store: None,
                 ostree: None,

lib/src/status.rs

@@ -114,6 +114,7 @@ pub(crate) fn labels_of_config(
 fn boot_entry_from_deployment(
     sysroot: &Storage,
     deployment: &ostree::Deployment,
+    booted_kernel_checksum: Option<&str>,
 ) -> Result<BootEntry> {
     let (
         store,
@@ -144,10 +145,14 @@ fn boot_entry_from_deployment(
         (None, CachedImageStatus::default(), false)
     };
 
+    let bootcsum = deployment.bootcsum();
+    let soft_reboot_capable = booted_kernel_checksum == Some(bootcsum.as_ref());
+
     let r = BootEntry {
         image,
         cached_update,
         incompatible,
+        soft_reboot_capable,
         store,
         pinned: deployment.is_pinned(),
         ostree: Some(crate::spec::BootEntryOstree {
@@ -228,27 +233,29 @@ pub(crate) fn get_status(
         other,
     };
 
+    let booted_kernel_checksum = booted_deployment.as_ref().map(|d| d.bootcsum());
+    let booted_kernel_checksum = booted_kernel_checksum.as_deref();
+    let booted = booted_deployment
+        .as_ref()
+        .map(|d| boot_entry_from_deployment(sysroot, d, None))
+        .transpose()
+        .context("Booted deployment")?;
     let staged = deployments
         .staged
         .as_ref()
-        .map(|d| boot_entry_from_deployment(sysroot, d))
+        .map(|d| boot_entry_from_deployment(sysroot, d, booted_kernel_checksum))
         .transpose()
         .context("Staged deployment")?;
-    let booted = booted_deployment
-        .as_ref()
-        .map(|d| boot_entry_from_deployment(sysroot, d))
-        .transpose()
-        .context("Booted deployment")?;
     let rollback = deployments
         .rollback
         .as_ref()
-        .map(|d| boot_entry_from_deployment(sysroot, d))
+        .map(|d| boot_entry_from_deployment(sysroot, d, booted_kernel_checksum))
         .transpose()
         .context("Rollback deployment")?;
     let other_deployments = deployments
         .other
         .iter()
-        .map(|d| boot_entry_from_deployment(sysroot, d))
+        .map(|d| boot_entry_from_deployment(sysroot, d, booted_kernel_checksum))
         .collect::<Result<Vec<_>>>()
         .context("Other deployments")?;
     let spec = staged