check-routeros-update: drop check for cap

This becomes complicated with legacy wireless and wifiwave2 package, old
and new CAPsMAN. Let's just drop the check.
This commit is contained in:
Christian Hesse 2023-01-31 12:35:19 +01:00
parent 819c7294c6
commit cbc547332e
5 changed files with 2 additions and 11 deletions

View file

@ -12,7 +12,6 @@
:global Identity; :global Identity;
:global SafeUpdateNeighbor; :global SafeUpdateNeighbor;
:global SafeUpdateOnCap;
:global SafeUpdatePatch; :global SafeUpdatePatch;
:global SafeUpdateUrl; :global SafeUpdateUrl;
:global SentRouterosUpdateNotification; :global SentRouterosUpdateNotification;
@ -39,12 +38,6 @@ $ScriptLock $0;
$WaitFullyConnected; $WaitFullyConnected;
:if ([ /interface/wireless/cap/get enabled ] = true && \
[ /caps-man/manager/get enabled ] = false && \
$SafeUpdateOnCap != true) do={
$LogPrintExit2 error $0 ("System is managed by CAPsMAN, not checking for RouterOS version.") true;
}
:if ([ :len [ /system/scheduler/find where name="reboot-for-update" ] ] > 0) do={ :if ([ :len [ /system/scheduler/find where name="reboot-for-update" ] ] > 0) do={
:error "A reboot for update is already scheduled."; :error "A reboot for update is already scheduled.";
} }

View file

@ -51,7 +51,6 @@ safe versions from a web server. The configuration goes to
`global-config-overlay`, this is the parameter: `global-config-overlay`, this is the parameter:
* `SafeUpdateNeighbor`: install updates automatically if seen in neighbor list * `SafeUpdateNeighbor`: install updates automatically if seen in neighbor list
* `SafeUpdateOnCap`: check for updates even if device is managed by CAPsMAN
* `SafeUpdatePatch`: install patch updates automatically * `SafeUpdatePatch`: install patch updates automatically
* `SafeUpdateUrl`: url to check for safe update, the channel (`long-term`, * `SafeUpdateUrl`: url to check for safe update, the channel (`long-term`,
`stable` or `testing`) is appended `stable` or `testing`) is appended

View file

@ -104,8 +104,6 @@
:global SafeUpdatePatch false; :global SafeUpdatePatch false;
# Allow to install updates automatically if seen in neighbor list. # Allow to install updates automatically if seen in neighbor list.
:global SafeUpdateNeighbor false; :global SafeUpdateNeighbor false;
# Allow to install updates even if device is managed by CAPsMAN.
:global SafeUpdateOnCap false;
# These thresholds control when to send health notification # These thresholds control when to send health notification
# on temperature and voltage. # on temperature and voltage.

View file

@ -99,6 +99,7 @@
88="Added support for monitoring CPU load and available free RAM in 'check-health'."; 88="Added support for monitoring CPU load and available free RAM in 'check-health'.";
89="Made the warning time for 'check-certificates' configurable."; 89="Made the warning time for 'check-certificates' configurable.";
90="Chat with your router! Introduced 'telegram-chat' to chat via Telegram bot and send commands to your router."; 90="Chat with your router! Introduced 'telegram-chat' to chat via Telegram bot and send commands to your router.";
91="Dropped check for CAP in 'check-routeros-update' to solve issues with wifiwave2 package.";
}; };
# Migration steps to be applied on script updates # Migration steps to be applied on script updates

View file

@ -12,7 +12,7 @@
:local 0 "global-functions"; :local 0 "global-functions";
# expected configuration version # expected configuration version
:global ExpectedConfigVersion 90; :global ExpectedConfigVersion 91;
# global variables not to be changed by user # global variables not to be changed by user
:global GlobalFunctionsReady false; :global GlobalFunctionsReady false;