mirror of
https://github.com/sunnypilot/sunnypilot.git
synced 2026-08-22 02:33:47 +08:00
Merge branch 'master' into SP-147-sync-priv-2024
# Conflicts: # common/api/__init__.py # panda # release/build_release.sh # release/files_common # selfdrive/car/card.py # selfdrive/car/toyota/carcontroller.py # selfdrive/controls/controlsd.py # selfdrive/controls/radard.py # selfdrive/ui/qt/api.cc # selfdrive/ui/qt/maps/map.cc # selfdrive/ui/ui.cc # system/athena/manage_athenad.py # system/athena/manage_sunnylinkd.py # system/athena/sunnylinkd.py # system/manager/gitlab_runner.sh # system/manager/manager.py # system/manager/mapd_installer.py # system/manager/process_config.py # system/manager/sunnylink.py # system/sentry.py
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
#!/usr/bin/env sh
|
||||
|
||||
# Stop updater
|
||||
pkill -2 -f selfdrive.updated.updated
|
||||
pkill -2 -f system.updated.updated
|
||||
|
||||
# Remove pending update
|
||||
rm -f /data/safe_staging/finalized/.overlay_consistent
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env sh
|
||||
|
||||
# Send SIGHUP to updater
|
||||
pkill -1 -f selfdrive.updated
|
||||
pkill -1 -f system.updated
|
||||
|
||||
Reference in New Issue
Block a user