unattended-lte-firmware-upgrade: :do ... on-error=... -> :onerror ... do=...

This commit is contained in:
Christian Hesse 2025-05-08 10:14:24 +02:00
parent f22d46da96
commit 10ac816348

View file

@ -12,10 +12,10 @@
:foreach Interface in=[ /interface/lte/find where running ] do={ :foreach Interface in=[ /interface/lte/find where running ] do={
:local Firmware; :local Firmware;
:local IntName [ /interface/lte/get $Interface name ]; :local IntName [ /interface/lte/get $Interface name ];
:do { :onerror Err {
:set Firmware [ /interface/lte/firmware-upgrade $Interface as-value ]; :set Firmware [ /interface/lte/firmware-upgrade $Interface as-value ];
} on-error={ } do={
:log debug ("Could not get latest LTE firmware version for interface " . $IntName . "."); :log debug ("Could not get latest LTE firmware version for interface " . $IntName . ": " . $Err);
} }
:if ([ :typeof $Firmware ] = "array") do={ :if ([ :typeof $Firmware ] = "array") do={
@ -27,7 +27,7 @@
:set LTEFirmwareUpgrade; :set LTEFirmwareUpgrade;
/system/scheduler/remove ($1 . "-firmware-upgrade"); /system/scheduler/remove ($1 . "-firmware-upgrade");
:do { :onerror Err {
/interface/lte/firmware-upgrade $1 upgrade=yes; /interface/lte/firmware-upgrade $1 upgrade=yes;
:log info ("LTE firmware upgrade on '" . $1 . "' finished, waiting for reset."); :log info ("LTE firmware upgrade on '" . $1 . "' finished, waiting for reset.");
:delay 240s; :delay 240s;
@ -36,8 +36,8 @@
($Firmware->"installed") != ($Firmware->"latest")) do={ ($Firmware->"installed") != ($Firmware->"latest")) do={
:log warning ("LTE firmware versions still differ. Upgrade failed anyway?"); :log warning ("LTE firmware versions still differ. Upgrade failed anyway?");
} }
} on-error={ } do={
:log error ("LTE firmware upgrade on '" . $1 . "' failed."); :log error ("LTE firmware upgrade on '" . $1 . "' failed: " . $Err);
} }
} }