From 54f58bebb4736531b1381ec638e0568eb235a1b5 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 5 May 2025 18:01:28 +0200
Subject: [PATCH] capsman-rolling-upgrade: fail if global functions do not
 become ready

Co-authored-by: Ilya Kulakov <kulakov.ilya@gmail.com>
---
 capsman-rolling-upgrade.capsman.rsc  | 3 ++-
 capsman-rolling-upgrade.template.rsc | 3 ++-
 capsman-rolling-upgrade.wifi.rsc     | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/capsman-rolling-upgrade.capsman.rsc b/capsman-rolling-upgrade.capsman.rsc
index 791b3dbb..f973c8e7 100644
--- a/capsman-rolling-upgrade.capsman.rsc
+++ b/capsman-rolling-upgrade.capsman.rsc
@@ -13,7 +13,8 @@
 # !! Do not edit this file, it is generated from template!
 
 :global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
+:onerror e { :retry { :if ($GlobalFunctionsReady != true) \
+  do={ :error "Global functions not ready."; }; } delay=500ms max=20; } do={ :log error $e; };
 
 :local ExitOK false;
 :do {
diff --git a/capsman-rolling-upgrade.template.rsc b/capsman-rolling-upgrade.template.rsc
index 0b1cc2ba..74142a30 100644
--- a/capsman-rolling-upgrade.template.rsc
+++ b/capsman-rolling-upgrade.template.rsc
@@ -14,7 +14,8 @@
 # !! Pattern '%TEMPL%' is replaced, paths are filtered.
 
 :global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
+:onerror e { :retry { :if ($GlobalFunctionsReady != true) \
+  do={ :error "Global functions not ready."; }; } delay=500ms max=20; } do={ :log error $e; };
 
 :local ExitOK false;
 :do {
diff --git a/capsman-rolling-upgrade.wifi.rsc b/capsman-rolling-upgrade.wifi.rsc
index 4afdee2e..57626de3 100644
--- a/capsman-rolling-upgrade.wifi.rsc
+++ b/capsman-rolling-upgrade.wifi.rsc
@@ -13,7 +13,8 @@
 # !! Do not edit this file, it is generated from template!
 
 :global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
+:onerror e { :retry { :if ($GlobalFunctionsReady != true) \
+  do={ :error "Global functions not ready."; }; } delay=500ms max=20; } do={ :log error $e; };
 
 :local ExitOK false;
 :do {