From fbb3779d17c003618b6a31ecf726c5212c483f92 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Mon, 30 Oct 2023 13:50:43 +0100 Subject: [PATCH] Fix bootstrap timeout (120 sec), off by a factor 10 (1200 sec) Regression in v4.5 release cycle, no changelog notice needed. Reported as part of issue #378 by Alexander Zangerl. Signed-off-by: Joachim Wiberg --- src/sm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/sm.c b/src/sm.c index b99ab6bd..73850ac5 100644 --- a/src/sm.c +++ b/src/sm.c @@ -52,19 +52,19 @@ sm_t sm; */ static void sm_check_bootstrap(void *work) { - static int cnt = 120 * 10; /* We run with 100ms period */ + static int timeout = 120; int level = cfglevel; dbg("Step all services ..."); service_step_all(SVC_TYPE_ANY); - if (cnt-- > 0 && !service_completed()) { - dbg("Not all bootstrap run/tasks have completed yet ... %d", cnt); + if (timeout-- > 0 && !service_completed()) { + dbg("Not all bootstrap run/tasks have completed yet ... %d", timeout); schedule_work(work); return; } - if (cnt > 0) + if (timeout > 0) dbg("All run/task have completed, resuming bootstrap."); else dbg("Timeout, resuming bootstrap.");