This commit is contained in:
firestar5683
2026-08-23 11:29:46 -05:00
parent db5922db43
commit 2db8d95905
8 changed files with 436 additions and 1379 deletions
@@ -1,6 +1,8 @@
import subprocess
import time
from openpilot.system.hardware import HARDWARE
_DELETE_TIMEOUT_S = 1800
_DELETE_RETRY_ATTEMPTS = 20
@@ -8,6 +10,11 @@ _DELETE_RETRY_DELAY_S = 0.25
_DIRECTORY_NOT_EMPTY_ERROR = "directory not empty"
def request_system_factory_reset():
"""Request AGNOS's stock userdata reset and reboot flow."""
HARDWARE.uninstall()
def remove_path(path):
# Managed processes can recreate entries under /data/params while rm is finishing.
for attempt in range(_DELETE_RETRY_ATTEMPTS):
@@ -16,6 +16,24 @@ def _load_factory_reset_module():
factory_reset = _load_factory_reset_module()
def test_request_system_factory_reset_uses_agnos_uninstall(monkeypatch):
calls = []
monkeypatch.setattr(factory_reset.HARDWARE, "uninstall", lambda: calls.append(True))
factory_reset.request_system_factory_reset()
assert calls == [True]
def test_galaxy_factory_reset_worker_does_not_partially_delete_userdata():
source = (Path(__file__).resolve().parents[1] / "the_galaxy.py").read_text(encoding="utf-8")
worker = source.split("def _factory_reset_worker():", 1)[1].split("\ndef ", 1)[0]
assert "_request_system_factory_reset()" in worker
assert "_run_factory_reset_delete" not in worker
assert "_finish_update_and_reboot" not in worker
def test_remove_path_retries_directory_not_empty(monkeypatch):
results = iter(
[
+8 -37
View File
@@ -98,7 +98,10 @@ from openpilot.starpilot.common.testing_grounds import (
TESTING_GROUNDS_STATE_PATH as SHARED_TESTING_GROUNDS_STATE_PATH,
)
from openpilot.starpilot.navigation.destination_store import normalize_destination_payload, update_recent_destinations
from openpilot.starpilot.system.the_galaxy.factory_reset import remove_path as _run_factory_reset_delete
from openpilot.starpilot.system.the_galaxy.factory_reset import (
remove_path as _run_factory_reset_delete,
request_system_factory_reset as _request_system_factory_reset,
)
from openpilot.starpilot.system.the_galaxy import flm_workspace, utilities
from openpilot.starpilot.system.the_galaxy.update_recovery import inspect_interrupted_update, public_recovery_status, recover_interrupted_update
@@ -1437,22 +1440,6 @@ _fast_update_state = {
}
_ROUTE_DELETE_LOCK = threading.Lock()
_FACTORY_RESET_WIPE_PATHS = [
"/data/params",
"/cache/starpilot/params",
"/cache/params",
"/data/media/0/realdata",
"/data/media/0/realdata_HD",
"/data/media/0/realdata_konik",
"/data/models",
"/data/toggle_backups",
"/data/backups",
"/data/themes",
"/data/media/0/osm/offline",
"/cache/use_HD",
"/cache/use_konik",
]
_PLOTS_POLL_INTERVAL_S = 0.75
_PLOTS_BOOT_STABILIZATION_WINDOW_S = 45.0
_PLOTS_BOOT_POLL_INTERVAL_S = 1.0
@@ -2543,34 +2530,18 @@ def _factory_reset_worker():
started_at = time.time()
try:
_set_fast_update_progress(1, "Preparing factory reset", 10.0, "Cleaning up legacy device state...")
_set_fast_update_progress(1, "Preparing factory reset", 10.0, "Requesting AGNOS system reset...")
_set_fast_update_state(
running=True,
stage="factory-resetting",
message="Factory reset started. Wiping device state...",
message="Factory reset requested. AGNOS will erase userdata after reboot...",
lastError="",
lastMode="factory-reset",
startedAt=started_at,
finishedAt=0.0,
)
_set_fast_update_progress(1, "Preparing factory reset", 100.0, "Factory reset initialized.")
total_paths = max(1, len(_FACTORY_RESET_WIPE_PATHS))
for index, path in enumerate(_FACTORY_RESET_WIPE_PATHS, start=1):
step_percent = ((index - 1) / total_paths) * 100.0
_set_fast_update_progress(2, "Wiping device data", step_percent, f"Removing {path}...")
_run_factory_reset_delete(path)
_set_fast_update_progress(2, "Wiping device data", (index / total_paths) * 100.0, f"Removed {path}.")
_set_fast_update_progress(3, "Resetting factory state", 100.0, "Legacy device state removed.")
_set_fast_update_progress(4, "Finalizing reset", 50.0, "Syncing filesystem before reboot...")
subprocess.run(["sync"], capture_output=True, text=True, timeout=60, check=False)
_set_fast_update_progress(4, "Finalizing reset", 100.0, "Filesystem sync complete.")
_finish_update_and_reboot(
"Factory reset complete. Device is rebooting now. Please wait for reconnection."
)
_set_fast_update_progress(1, "Preparing factory reset", 100.0, "AGNOS reset trigger initialized.")
_request_system_factory_reset()
except Exception as exception:
_set_fast_update_error_state("Factory reset failed.", exception)