aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Christian Hesse <mail@eworm.de>2024-03-05 11:07:59 +0100
committerGravatar Christian Hesse <mail@eworm.de>2024-03-12 15:27:15 +0100
commite8c5585cc7557c5785096f33c678a4d789158874 (patch)
tree72116299a07dc521d5bc69ba318774d155c5fe92
parent34620ba53cb5fd1e3160c0a53a36c27ba34da256 (diff)
capsman-rolling-upgrade: drop support for wifiwave2
-rw-r--r--capsman-rolling-upgrade.template.rsc4
-rw-r--r--capsman-rolling-upgrade.wifiwave2.rsc49
-rw-r--r--doc/capsman-rolling-upgrade.md11
3 files changed, 3 insertions, 61 deletions
diff --git a/capsman-rolling-upgrade.template.rsc b/capsman-rolling-upgrade.template.rsc
index c810f43..731dbeb 100644
--- a/capsman-rolling-upgrade.template.rsc
+++ b/capsman-rolling-upgrade.template.rsc
@@ -30,16 +30,13 @@
:local RemoteCapCount [ :len [ /caps-man/remote-cap/find ] ];
:local RemoteCapCount [ :len [ /interface/wifi/capsman/remote-cap/find ] ];
- :local RemoteCapCount [ :len [ /interface/wifiwave2/capsman/remote-cap/find ] ];
:if ($RemoteCapCount > 0) do={
:local Delay (600 / $RemoteCapCount);
:if ($Delay > 120) do={ :set Delay 120; }
:foreach RemoteCap in=[ /caps-man/remote-cap/find where version!=$InstalledVersion ] do={
:foreach RemoteCap in=[ /interface/wifi/capsman/remote-cap/find where version!=$InstalledVersion ] do={
- :foreach RemoteCap in=[ /interface/wifiwave2/capsman/remote-cap/find where version!=$InstalledVersion ] do={
:local RemoteCapVal [ /caps-man/remote-cap/get $RemoteCap ];
:local RemoteCapVal [ /interface/wifi/capsman/remote-cap/get $RemoteCap ];
- :local RemoteCapVal [ /interface/wifiwave2/capsman/remote-cap/get $RemoteCap ];
:if ([ :len $RemoteCapVal ] > 1) do={
# NOT /caps-man/ #
:set ($RemoteCapVal->"name") ($RemoteCapVal->"common-name");
@@ -48,7 +45,6 @@
" (" . $RemoteCapVal->"identity" . ")...") false;
/caps-man/remote-cap/upgrade $RemoteCap;
/interface/wifi/capsman/remote-cap/upgrade $RemoteCap;
- /interface/wifiwave2/capsman/remote-cap/upgrade $RemoteCap;
} else={
$LogPrintExit2 warning $ScriptName ("Remote CAP vanished, skipping upgrade.") false;
}
diff --git a/capsman-rolling-upgrade.wifiwave2.rsc b/capsman-rolling-upgrade.wifiwave2.rsc
deleted file mode 100644
index 4b3aba4..0000000
--- a/capsman-rolling-upgrade.wifiwave2.rsc
+++ /dev/null
@@ -1,49 +0,0 @@
-#!rsc by RouterOS
-# RouterOS script: capsman-rolling-upgrade.wifiwave2
-# Copyright (c) 2018-2024 Christian Hesse <mail@eworm.de>
-# Michael Gisbers <michael@gisbers.de>
-# https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
-#
-# provides: capsman-rolling-upgrade
-# requires RouterOS, version=7.12
-#
-# upgrade CAPs one after another
-# https://git.eworm.de/cgit/routeros-scripts/about/doc/capsman-rolling-upgrade.md
-#
-# !! Do not edit this file, it is generated from template!
-
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
-:local Main do={
- :local ScriptName [ :tostr $1 ];
-
- :global LogPrintExit2;
- :global ScriptLock;
-
- :if ([ $ScriptLock $ScriptName ] = false) do={
- :return false;
- }
-
- :local InstalledVersion [ /system/package/update/get installed-version ];
-
- :local RemoteCapCount [ :len [ /interface/wifiwave2/capsman/remote-cap/find ] ];
- :if ($RemoteCapCount > 0) do={
- :local Delay (600 / $RemoteCapCount);
- :if ($Delay > 120) do={ :set Delay 120; }
- :foreach RemoteCap in=[ /interface/wifiwave2/capsman/remote-cap/find where version!=$InstalledVersion ] do={
- :local RemoteCapVal [ /interface/wifiwave2/capsman/remote-cap/get $RemoteCap ];
- :if ([ :len $RemoteCapVal ] > 1) do={
- :set ($RemoteCapVal->"name") ($RemoteCapVal->"common-name");
- $LogPrintExit2 info $ScriptName ("Starting upgrade for " . $RemoteCapVal->"name" . \
- " (" . $RemoteCapVal->"identity" . ")...") false;
- /interface/wifiwave2/capsman/remote-cap/upgrade $RemoteCap;
- } else={
- $LogPrintExit2 warning $ScriptName ("Remote CAP vanished, skipping upgrade.") false;
- }
- :delay ($Delay . "s");
- }
- }
-}
-
-$Main [ :jobname ];
diff --git a/doc/capsman-rolling-upgrade.md b/doc/capsman-rolling-upgrade.md
index bbc8e14..b4e342d 100644
--- a/doc/capsman-rolling-upgrade.md
+++ b/doc/capsman-rolling-upgrade.md
@@ -21,18 +21,13 @@ Requirements and installation
-----------------------------
Just install the script on CAPsMAN device.
-Depending on whether you use `wifi` package (`/interface/wifi`), `wifiwave2`
-package (`/interface/wifiwave2`) or legacy wifi with CAPsMAN (`/caps-man`)
-you need to install a different script.
+Depending on whether you use `wifi` package (`/interface/wifi`) or legacy
+wifi with CAPsMAN (`/caps-man`) you need to install a different script.
-For `wifi` (RouterOS 7.13 and later):
+For `wifi`:
$ScriptInstallUpdate capsman-rolling-upgrade.wifi;
-For `wifiwave2` (up to RouterOS 7.12):
-
- $ScriptInstallUpdate capsman-rolling-upgrade.wifiwave2;
-
For legacy CAPsMAN:
$ScriptInstallUpdate capsman-rolling-upgrade.capsman;