fix(src/rauc.rs): Use currently booted slot version as backup (if any)

Instead of only using the version of the primary slot (which may not be the currently booted), use the one of the currently booted, even if it is not the primary. This allows for proper version comparison and does not lead to scenarios in which the current slot's version is being ignored (and the system is potentially upgraded) Signed-off-by: David Runge <[email protected]>
dvzrv · Sep 11, 2023 · 910f5e5 · 910f5e5
1 parent 7412e41
commit 910f5e5
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/rauc.rs b/src/rauc.rs
@@ -254,9 +254,13 @@ impl RaucInfo {
                     let slot_primary = slot_name == primary;
 
                     // if this slot is the primary and has a version, expose it as the system version
-                    if slot_primary && slot_version.is_some() {
-                        system_version = slot_version.clone();
-                    }
+                    system_version = if (slot_primary && slot_version.is_some())
+                        || (slot_name == boot_slot && slot_version.is_some())
+                    {
+                        slot_version.clone()
+                    } else {
+                        None
+                    };
 
                     slots.push(Slot::new(
                         slot_primary,