aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Christian Hesse <mail@eworm.de>2023-01-31 12:35:19 +0100
committerGravatar Christian Hesse <mail@eworm.de>2023-01-31 17:27:15 +0100
commitcbc547332e511e1ae7a0658002e2cc595b3b1182 (patch)
treedc85b01ffa0aa6ed3e7869f31a805ab7a0efb6e0
parent819c7294c62c84fbc59bbf16a7d9ce97b4957e57 (diff)
check-routeros-update: drop check for capchange-91
This becomes complicated with legacy wireless and wifiwave2 package, old and new CAPsMAN. Let's just drop the check.
-rw-r--r--check-routeros-update7
-rw-r--r--doc/check-routeros-update.md1
-rw-r--r--global-config2
-rw-r--r--global-config.changes1
-rw-r--r--global-functions2
5 files changed, 2 insertions, 11 deletions
diff --git a/check-routeros-update b/check-routeros-update
index ccc0d79..3e5a381 100644
--- a/check-routeros-update
+++ b/check-routeros-update
@@ -12,7 +12,6 @@
:global Identity;
:global SafeUpdateNeighbor;
-:global SafeUpdateOnCap;
:global SafeUpdatePatch;
:global SafeUpdateUrl;
:global SentRouterosUpdateNotification;
@@ -39,12 +38,6 @@ $ScriptLock $0;
$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={
:error "A reboot for update is already scheduled.";
}
diff --git a/doc/check-routeros-update.md b/doc/check-routeros-update.md
index 696abe6..348acc6 100644
--- a/doc/check-routeros-update.md
+++ b/doc/check-routeros-update.md
@@ -51,7 +51,6 @@ safe versions from a web server. The configuration goes to
`global-config-overlay`, this is the parameter:
* `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
* `SafeUpdateUrl`: url to check for safe update, the channel (`long-term`,
`stable` or `testing`) is appended
diff --git a/global-config b/global-config
index 4b5338a..1e7a185 100644
--- a/global-config
+++ b/global-config
@@ -104,8 +104,6 @@
:global SafeUpdatePatch false;
# Allow to install updates automatically if seen in neighbor list.
: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
# on temperature and voltage.
diff --git a/global-config.changes b/global-config.changes
index 94da56c..3db2a28 100644
--- a/global-config.changes
+++ b/global-config.changes
@@ -99,6 +99,7 @@
88="Added support for monitoring CPU load and available free RAM in 'check-health'.";
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.";
+ 91="Dropped check for CAP in 'check-routeros-update' to solve issues with wifiwave2 package.";
};
# Migration steps to be applied on script updates
diff --git a/global-functions b/global-functions
index 7fe3873..8d865ba 100644
--- a/global-functions
+++ b/global-functions
@@ -12,7 +12,7 @@
:local 0 "global-functions";
# expected configuration version
-:global ExpectedConfigVersion 90;
+:global ExpectedConfigVersion 91;
# global variables not to be changed by user
:global GlobalFunctionsReady false;