retropilot
/
openpilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

updated: log git diff on overlay init (#20476) 

* updated: log git diff on overlay init

* add git diff param

* params
albatross
Adeeb Shihadeh 2021-03-25 16:16:12 -07:00 committed by GitHub
parent e7fc11c7fb
commit bcb6879199
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/params_pyx.pyx
View File

@ -28,6 +28,7 @@ keys = {
b"DisableUpdates": [TxType.PERSISTENT],
b"DoUninstall": [TxType.CLEAR_ON_MANAGER_START],
b"DongleId": [TxType.PERSISTENT],
b"GitDiff": [TxType.PERSISTENT],
b"GitBranch": [TxType.PERSISTENT],
b"GitCommit": [TxType.PERSISTENT],
b"GitRemote": [TxType.PERSISTENT],

7
selfdrive/updated.py
View File

@ -164,7 +164,8 @@ def init_overlay() -> None:
cloudlog.info("preparing new safe staging area")
Params().put("UpdateAvailable", "0")
params = Params()
params.put("UpdateAvailable", "0")
set_consistent_flag(False)
dismount_overlay()
if os.path.isdir(STAGING_ROOT):
@ -196,6 +197,10 @@ def init_overlay() -> None:
else:
run(mount_cmd)
git_diff = run(["git", "diff"], OVERLAY_MERGED, low_priority=True)
params.put("GitDiff", git_diff)
cloudlog.info(f"git diff output:\n{git_diff}")
def finalize_update() -> None:
"""Take the current OverlayFS merged view and finalize a copy outside of