kill stale text-error window by comm too, not just path
selfdrive/ui/text is a shell wrapper that execs ./_text. After exec, the running process's argv has no path component, so pkill -f 'selfdrive/ui/text' silently misses it. Add pkill -x _text alongside the existing path-pattern kills in build_only.sh, launch_openpilot.sh, and launch_chffrplus.sh.
This commit is contained in:
+4
-1
@@ -10,8 +10,11 @@ BASEDIR="/data/openpilot"
|
|||||||
# Fix ownership — we edit as root, openpilot builds/runs as comma
|
# Fix ownership — we edit as root, openpilot builds/runs as comma
|
||||||
sudo chown -R comma:comma "$BASEDIR"
|
sudo chown -R comma:comma "$BASEDIR"
|
||||||
|
|
||||||
# Kill stale error displays and any running manager/launch/managed processes
|
# Kill stale error displays and any running manager/launch/managed processes.
|
||||||
|
# `text` is a shell wrapper that execs `./_text` — after exec the process is named
|
||||||
|
# `_text` (no path), so we kill by exact comm in addition to the path pattern.
|
||||||
pkill -9 -f "selfdrive/ui/text" 2>/dev/null
|
pkill -9 -f "selfdrive/ui/text" 2>/dev/null
|
||||||
|
pkill -9 -x _text 2>/dev/null
|
||||||
pkill -9 -f 'launch_openpilot.sh' 2>/dev/null
|
pkill -9 -f 'launch_openpilot.sh' 2>/dev/null
|
||||||
pkill -9 -f 'launch_chffrplus.sh' 2>/dev/null
|
pkill -9 -f 'launch_chffrplus.sh' 2>/dev/null
|
||||||
pkill -9 -f 'python.*manager.py' 2>/dev/null
|
pkill -9 -f 'python.*manager.py' 2>/dev/null
|
||||||
|
|||||||
+4
-1
@@ -79,8 +79,11 @@ function launch {
|
|||||||
agnos_init
|
agnos_init
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# CLEARPILOT: kill stale error display from previous build/run
|
# CLEARPILOT: kill stale error display from previous build/run.
|
||||||
|
# `text` is a wrapper that execs ./_text — running process is named _text
|
||||||
|
# with no path, so kill by exact comm too.
|
||||||
pkill -f "selfdrive/ui/text" 2>/dev/null
|
pkill -f "selfdrive/ui/text" 2>/dev/null
|
||||||
|
pkill -x _text 2>/dev/null
|
||||||
|
|
||||||
# write tmux scrollback to a file
|
# write tmux scrollback to a file
|
||||||
tmux capture-pane -pq -S-1000 > /tmp/launch_log
|
tmux capture-pane -pq -S-1000 > /tmp/launch_log
|
||||||
|
|||||||
@@ -13,6 +13,9 @@ pkill -9 -f 'selfdrive\.' 2>/dev/null
|
|||||||
pkill -9 -f 'system\.' 2>/dev/null
|
pkill -9 -f 'system\.' 2>/dev/null
|
||||||
pkill -9 -f './ui' 2>/dev/null
|
pkill -9 -f './ui' 2>/dev/null
|
||||||
pkill -9 -f 'selfdrive/ui/text' 2>/dev/null
|
pkill -9 -f 'selfdrive/ui/text' 2>/dev/null
|
||||||
|
# `text` is a shell wrapper that execs `./_text` — after exec the running
|
||||||
|
# process's argv has no path, so kill by exact comm too.
|
||||||
|
pkill -9 -x _text 2>/dev/null
|
||||||
sleep 1
|
sleep 1
|
||||||
|
|
||||||
# CLEARPILOT: ensure params persistence dir is owned by comma:comma. Editing
|
# CLEARPILOT: ensure params persistence dir is owned by comma:comma. Editing
|
||||||
|
|||||||
Reference in New Issue
Block a user