Protect ESP32 identities during interrupted partition migration

This commit is contained in:
mikecarper committed 2026-10-15 11:03:43 -07:00
1 parent 3347a62780
commit d3bbd5a4d0
3 files changed
+230 -11

No files matched your search

+10 -1
View File
@@ -945,7 +945,15 @@ bool DataStore::formatInternalExtraFSHealth(char* reply,
#endif
bool DataStore::loadMainIdentity(mesh::LocalIdentity &identity) {
#if defined(ESP32_PLATFORM) || defined(RP2040_PLATFORM)
#if defined(ESP32_PLATFORM)
// A missing SPIFFS file can still have its original identity staged in NVS
// by partition migration. Let the migration-aware, tri-state loader decide
// whether absence is safe before startup is allowed to generate a new key.
const IdentityLoadResult result = identity_store.loadResult("_main", identity);
_identity_creation_blocked = result == IdentityLoadResult::Unreadable;
return result == IdentityLoadResult::Loaded;
#else
#if defined(RP2040_PLATFORM)
if (!identity_store.recover("_main")) {
_identity_creation_blocked = true;
return false;
@@ -990,6 +998,7 @@ bool DataStore::loadMainIdentity(mesh::LocalIdentity &identity) {
_identity_creation_blocked = false;
return true;
#endif
#endif
}
bool DataStore::canCreateMainIdentity() const {