add more helper and fix function names

Author: jmarrero

crates/lib/src/cli.rs

@@ -754,8 +754,8 @@ pub(crate) fn require_root(is_container: bool) -> Result<()> {
     Ok(())
 }
 
-/// Check if a deployment can perform a soft reboot
-fn can_perform_soft_reboot(deployment: Option<&crate::spec::BootEntry>) -> bool {
+/// Check if a deployment has soft reboot capability
+fn has_soft_reboot_capability(deployment: Option<&crate::spec::BootEntry>) -> bool {
     deployment.map(|d| d.soft_reboot_capable).unwrap_or(false)
 }
 
@@ -907,7 +907,7 @@ async fn upgrade(opts: UpgradeOpts) -> Result<()> {
         if staged_unchanged {
             println!("Staged update present, not changed.");
             if opts.queue_soft_reboot {
-                if can_perform_soft_reboot(host.status.staged.as_ref()) {
+                if has_soft_reboot_capability(host.status.staged.as_ref()) {
                     soft_reboot_staged(sysroot)?;
                 }
             }
@@ -936,7 +936,7 @@ async fn upgrade(opts: UpgradeOpts) -> Result<()> {
             // At this point we have new staged deployment and the host definition has changed.
             // We need the updated host status before we check if we can prepare the soft-reboot.
             let updated_host = crate::status::get_status(sysroot, Some(&booted_deployment))?.1;
-            if can_perform_soft_reboot(updated_host.status.staged.as_ref()) {
+            if has_soft_reboot_capability(updated_host.status.staged.as_ref()) {
                 soft_reboot_staged(sysroot)?;
             }
         }
@@ -1020,7 +1020,7 @@ async fn switch(opts: SwitchOpts) -> Result<()> {
         // At this point we have staged the deployment and the host definition has changed.
         // We need the updated host status before we check if we can prepare the soft-reboot.
         let updated_host = crate::status::get_status(sysroot, Some(&booted_deployment))?.1;
-        if can_perform_soft_reboot(updated_host.status.staged.as_ref()) {
+        if has_soft_reboot_capability(updated_host.status.staged.as_ref()) {
             soft_reboot_staged(sysroot)?;
         }
     }
@@ -1042,7 +1042,7 @@ async fn rollback(opts: RollbackOpts) -> Result<()> {
         // Get status after the rollback is done 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()) {
+        if has_soft_reboot_capability(host.status.rollback.as_ref()) {
             println!("Rollback deployment is soft-reboot capable, preparing for soft-reboot...");
 
             let deployments_list = sysroot.deployments();

crates/lib/src/status.rs

@@ -86,6 +86,11 @@ impl From<ImageReference> for OstreeImageReference {
     }
 }
 
+/// Check if a deployment has soft reboot capability
+fn has_soft_reboot_capability(sysroot: &Storage, deployment: &ostree::Deployment) -> bool {
+    ostree_ext::systemd_has_soft_reboot() && sysroot.deployment_can_soft_reboot(deployment)
+}
+
 /// Parse an ostree origin file (a keyfile) and extract the targeted
 /// container image reference.
 fn get_image_origin(origin: &glib::KeyFile) -> Result<Option<OstreeImageReference>> {
@@ -144,8 +149,7 @@ fn boot_entry_from_deployment(
         (None, CachedImageStatus::default(), false)
     };
 
-    let soft_reboot_capable =
-        ostree_ext::systemd_has_soft_reboot() && sysroot.deployment_can_soft_reboot(deployment);
+    let soft_reboot_capable = has_soft_reboot_capability(sysroot, deployment);
 
     let r = BootEntry {
         image,