Addressed requested changes

Signed-off-by: Piet Gömpel <[email protected]>

Author: Pietfried

lib/everest/system/include/everest/system/rauc-dbus-base.hpp

@@ -68,11 +68,13 @@ struct UpdateTransaction {
 };
 
 enum class HealthCheckStatus {
-    Success,
-    ScriptNotSet,
+    ScriptExitedWithError,
     ScriptNotExecutable,
+    ScriptNotSet,
+    ScriptTerminatedBySignal,
     SetupFailed,
-    ScriptError
+    Success,
+    UnknownError
 };
 
 Operation string_to_operation(const std::string_view& s);

lib/everest/system/src/rauc-dbus-base.cpp

@@ -222,19 +222,19 @@ rauc_messages::HealthCheckStatus RaucBase::check_system_health() {
         return HealthCheckStatus::SetupFailed;
     case everest::lib::system::CMD_TERMINATED:
         EVLOG_error << "Health check script '" << verify_update_script_path << "' terminated by signal: " << res.code;
-        return HealthCheckStatus::ScriptError;
+        return HealthCheckStatus::ScriptTerminatedBySignal;
     case everest::lib::system::CMD_SUCCESS:
         if (res.code == 0) {
             EVLOG_debug << "Health check script '" << verify_update_script_path << "' returned success";
             return HealthCheckStatus::Success;
         } else {
             EVLOG_error << "Health check script '" << verify_update_script_path
                         << "' returned error code: " << res.code;
-            return HealthCheckStatus::ScriptError;
+            return HealthCheckStatus::ScriptExitedWithError;
         }
     }
     // Should not reach here
-    return HealthCheckStatus::ScriptError;
+    return HealthCheckStatus::UnknownError;
 }
 
 sdbus::PendingAsyncCall RaucBase::get_operation(property_cb handler) const {

lib/everest/system/src/safe-system.cpp

@@ -138,7 +138,7 @@ std::string cmd_execution_status_to_string(const CommandExecutionStatus& status)
     case CommandExecutionStatus::CMD_SETUP_FAILED:
         return "CMD_SETUP_FAILED";
     default:
-        throw std::runtime_error("No known conversion for the given CommandExecutionStatus");
+        return "CMD_UNKNOWN_STATUS";
     }
 }
 

modules/Misc/Linux_Systemd_Rauc/rauc-dbus.cpp

@@ -115,14 +115,17 @@ bool Rauc::decide_if_good(const rauc_dbus::rauc_messages::UpdateTransaction& sav
     // as reliable as hoped. A change in boot slot should be more reliable
     // however prior to this change the boot slot wasn't saved
 
-    bool result;
-    if (saved.boot_slot.empty()) {
-        // use the previous approach
-        EVLOG_warning << "OTA: fallback to using primary slot";
-        result = saved.primary_slot == current.primary_slot;
-    } else {
-        // use the new approach
-        result = saved.boot_slot != current.boot_slot;
+    bool result{false};
+
+    if (RaucBase::decide_if_good(saved, current)) {
+        if (saved.boot_slot.empty()) {
+            // use the previous approach
+            EVLOG_warning << "OTA: fallback to using primary slot";
+            result = saved.primary_slot == current.primary_slot;
+        } else {
+            // use the new approach
+            result = saved.boot_slot != current.boot_slot;
+        }
     }
     return result;
 }