From 2209c0e1f996b661c94ed6392c3881ae810a1b7e Mon Sep 17 00:00:00 2001 From: Mikhail Shahovalov Date: Thu, 3 Sep 2026 05:24:27 +0300 Subject: [PATCH] =?UTF-8?q?update=5Ffw.sh:=20=D1=8F=D0=B2=D0=BD=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=B4=D0=B8=D0=B0=D0=B3=D0=BD=D0=BE=D1=81=D1=82=D0=B8?= =?UTF-8?q?=D0=BA=D0=B0=20crash-loop=20klipper-mcu=20=D0=BF=D0=BE=D1=81?= =?UTF-8?q?=D0=BB=D0=B5=20=D0=BF=D1=80=D0=BE=D1=88=D0=B8=D0=B2=D0=BA=D0=B8?= =?UTF-8?q?=20host?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 5 --- firmware/update_fw.sh | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/firmware/update_fw.sh b/firmware/update_fw.sh index b8177ab..29199ff 100755 --- a/firmware/update_fw.sh +++ b/firmware/update_fw.sh @@ -207,8 +207,18 @@ if want host; then HOST_PID_OLD=$(systemctl show -p ExecMainPID --value klipper-mcu) make -C "$KLIPPER" flash KCONFIG_CONFIG="$BUILD_TMP/$HOST_CFG" [ "$(stat -c %Y "$HOST_BIN")" -ge "$START_TS" ] || die "$HOST_BIN не обновился" - host_restarted() { [ "$(systemctl show -p ExecMainPID --value klipper-mcu)" != "$HOST_PID_OLD" ] && [ -e /tmp/klipper_host_mcu ]; } - wait_for 10 "klipper-mcu не перезапустился (PID $HOST_PID_OLD)" host_restarted + host_restarted() { + [ "$(systemctl show -p ExecMainPID --value klipper-mcu)" != "$HOST_PID_OLD" ] \ + && [ "$(systemctl show -p SubState --value klipper-mcu)" = "running" ] && [ -e /tmp/klipper_host_mcu ] + } + if ! wait_for 10 "klipper-mcu не перезапустился (PID $HOST_PID_OLD)" host_restarted; then + journalctl -u klipper-mcu -n 8 --no-pager -o cat || true + die "klipper-mcu не работает после прошивки (см. journalctl -u klipper-mcu)" + fi + # Убедиться, что процесс не падает в цикле перезапуска (Restart=always) + sleep 3 + [ "$(systemctl show -p SubState --value klipper-mcu)" = "running" ] \ + || { journalctl -u klipper-mcu -n 8 --no-pager -o cat || true; die "klipper-mcu перезапускается в цикле"; } echo "klipper-mcu перезапущен (PID $HOST_PID_OLD -> $(systemctl show -p ExecMainPID --value klipper-mcu)), $HOST_BIN обновлён" fi