From 41b6f6338225d2554bc826f8979274f35ede42c8 Mon Sep 17 00:00:00 2001
From: zuevav <zuevav@gmail.com>
Date: Mon, 5 Oct 2026 21:34:16 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D1=80=D0=B0=D0=B7:=20=D0=B7=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=B7=D0=B0=D0=B3?=
 =?UTF-8?q?=D1=80=D1=83=D0=B7=D0=BA=D0=B8=20=D1=83=D1=81=D1=82=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B2=D1=89=D0=B8=D0=BA=D0=B0=20(.29=E2=80=93.31)=20?=
 =?UTF-8?q?=E2=80=94=20systemd-run=20=D0=B8=D0=B7=20bootcmd=20=D0=B6=D0=B4?=
 =?UTF-8?q?=D0=B0=D0=BB=20=D0=B7=D0=B0=D0=BF=D1=83=D1=81=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D1=81=D0=BB=D1=83=D0=B6=D0=B1=D1=8B=20=D1=8D=D0=BA=D1=80=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B0,=20=D0=B0=20=D0=BE=D0=BD=D0=B0=20=D0=B6=D0=B4?=
 =?UTF-8?q?=D0=B0=D0=BB=D0=B0=20sysinit.target,=20=D1=82=D0=BE=20=D0=B5?=
 =?UTF-8?q?=D1=81=D1=82=D1=8C=20=D0=BA=D0=BE=D0=BD=D1=86=D0=B0=20=D1=82?=
 =?UTF-8?q?=D0=BE=D0=B3=D0=BE=20=D0=B6=D0=B5=20cloud-init;=20=D1=82=D0=B5?=
 =?UTF-8?q?=D0=BF=D0=B5=D1=80=D1=8C=20--no-block,=20DefaultDependencies=3D?=
 =?UTF-8?q?no=20=D0=B8=20=D0=BE=D0=B3=D1=80=D0=B0=D0=BD=D0=B8=D1=87=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B2=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=20=D0=BD=D0=B0=20=D0=BA=D0=B0=D0=B6=D0=B4=D1=83=D1=8E=20=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4=D1=83:=20=D1=8D=D0=BA=D1=80?=
 =?UTF-8?q?=D0=B0=D0=BD=20=D0=BD=D0=B5=20=D0=BC=D0=BE=D0=B6=D0=B5=D1=82=20?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=B4=D0=B5=D1=80=D0=B6=D0=B0=D1=82=D1=8C=20=D0=B7?=
 =?UTF-8?q?=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_014FsEKyJrYF69Cj9ZXzFLRi
---
 deploy/iso/bj-install-progress-start | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/deploy/iso/bj-install-progress-start b/deploy/iso/bj-install-progress-start
index be02399..190767d 100755
--- a/deploy/iso/bj-install-progress-start
+++ b/deploy/iso/bj-install-progress-start
@@ -6,18 +6,22 @@
 P=/cdrom/bj/bj-install-progress
 log() { logger -t bj-install-progress "$*" 2>/dev/null || true; }
 CLEAN="env -i PATH=/usr/sbin:/usr/bin:/sbin:/bin LANG=C.UTF-8"  # без окружения snap установщика
-if systemctl is-active --quiet bj-install-progress.service 2>/dev/null; then
+if timeout 5 systemctl is-active --quiet bj-install-progress.service 2>/dev/null; then
   exit 0  # уже показывается
 fi
 if ! command -v python3 >/dev/null 2>&1; then log "нет python3 — экран не запущен"; exit 0; fi
 if [ ! -f "$P" ]; then log "нет $P — экран не запущен"; exit 0; fi
 # упал экран — вернуть экран установщика Ubuntu
 CMD="python3 -I $P || systemctl start snap.subiquity.subiquity-service.service"
-if OUT=$($CLEAN systemd-run --unit=bj-install-progress --collect -p StandardOutput=tty -p StandardError=journal \
-    -p TTYPath=/dev/tty1 -p TTYReset=yes -p Environment=LANG=C.UTF-8 /bin/sh -c "$CMD" 2>&1); then
+# --no-block и DefaultDependencies=no обязательны: из bootcmd (cloud-init, он идёт до sysinit.target) обычный
+# systemd-run ждал бы запуска службы, а служба — sysinit.target, то есть конца этого же cloud-init: загрузка
+# зависала (образы .29–.31). timeout — на всякий случай: экран никогда не держит загрузку дольше 15 секунд.
+if OUT=$($CLEAN timeout 15 systemd-run --no-block --unit=bj-install-progress --collect -p DefaultDependencies=no \
+    -p StandardOutput=tty -p StandardError=journal -p TTYPath=/dev/tty1 -p TTYReset=yes -p Environment=LANG=C.UTF-8 \
+    /bin/sh -c "$CMD" 2>&1); then
   log "экран запущен ($1): $OUT"
 else
   log "systemd-run не сработал ($1): $OUT — запускаю напрямую"
-  $CLEAN setsid -f /bin/sh -c "$CMD" </dev/null >/dev/tty1 2>>/run/bj-install-progress.err || log "прямой запуск не удался"
+  $CLEAN timeout 5 setsid -f /bin/sh -c "$CMD" </dev/null >/dev/tty1 2>>/run/bj-install-progress.err || log "прямой запуск не удался"
 fi
 exit 0