[codex] Restore admin in root reset firmware - #40
Merged
Conversation
massif-01
marked this pull request as ready for review
June 15, 2026 17:39
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
rootandadmincredentials torm01ts_auth_layoutWhy
The previous recovery firmware only reset
ts_auth/cred_root. In a controlled recovery scenario where admin access is also unavailable, that still leaves the device unusable through normal admin workflows after recovery. This change makes the recovery behavior explicit and symmetrical for the two built-in auth users while preserving the same NVS layout version.Scope and Compatibility
v0.5.1release assets and tag are not changed by this PR.root_password_reset_main.c; the recovery entrypoint is only selected whenROOT_PASSWORD_RESET=ON.TS_AUTH_DEFAULT_ADMIN_PASSWORD.TS_AUTH_CONFIG_VERSION == 3; the credential struct and offsets are unchanged.Validation
git diff --checkROOT_PASSWORD_RESET_VERSION=9.9.9 ./tools/build_root_reset.shOTA_Server/server.py9.9.9-root-reset.172435.339f0575a4cfe92ceebe3433792c97b65cfec537b91b390f1d0b7a5ba5c84200c843a3root_password_reset_main.cRelease Note
The
v9.9.9-root-resetprerelease has been updated to contain only the app-only recovery firmware asset:TianShanOS-RootReset-v9.9.9.binFull-flash helper assets and normal firmware/WebUI assets were removed from that prerelease to avoid accidental full-device flashing.