aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CONTRIBUTIONS.md1
-rw-r--r--backup-partition.rsc28
-rw-r--r--capsman-download-packages.capsman.rsc8
-rw-r--r--capsman-download-packages.template.rsc8
-rw-r--r--capsman-download-packages.wifi.rsc8
-rw-r--r--capsman-rolling-upgrade.capsman.rsc2
-rw-r--r--capsman-rolling-upgrade.template.rsc2
-rw-r--r--capsman-rolling-upgrade.wifi.rsc2
-rw-r--r--global-functions.rsc7
9 files changed, 43 insertions, 23 deletions
diff --git a/CONTRIBUTIONS.md b/CONTRIBUTIONS.md
index 13d0508..e9bf7d1 100644
--- a/CONTRIBUTIONS.md
+++ b/CONTRIBUTIONS.md
@@ -47,6 +47,7 @@ Add yourself to the list,
* Marek Čábák
* Oleksandr Yukhymchuk
* Peter Holtkamp
+* Peter Ponzel
* Reiner Vehrenkamp
* Richard Österreicher
* Simon Hitzemann
diff --git a/backup-partition.rsc b/backup-partition.rsc
index 3c883f7..34cdc8f 100644
--- a/backup-partition.rsc
+++ b/backup-partition.rsc
@@ -24,17 +24,18 @@
:global VersionToNum;
:local CopyTo do={
- :local ScriptName [ :tostr $1 ];
- :local FallbackTo [ :tostr $2 ];
+ :local ScriptName [ :tostr $1 ];
+ :local FallbackTo [ :toid $2 ];
+ :local FallbackToName [ :tostr $3 ];
:global LogPrint;
:do {
/partitions/copy-to $FallbackTo;
- $LogPrint info $ScriptName ("Copied RouterOS to partition '" . $FallbackTo . "'.");
+ $LogPrint info $ScriptName ("Copied RouterOS to partition '" . $FallbackToName . "'.");
:return true;
} on-error={
- $LogPrint error $ScriptName ("Failed copying RouterOS to partition '" . $FallbackTo . "'!");
+ $LogPrint error $ScriptName ("Failed copying RouterOS to partition '" . $FallbackToName . "'!");
:return false;
}
}
@@ -58,13 +59,20 @@
:error false;
}
- :local FallbackTo [ /partitions/get $ActiveRunning fallback-to ];
+ :local FallbackToName [ /partitions/get $ActiveRunning fallback-to ];
+ :local FallbackTo [ /partition/find where name=$FallbackToName !active ];
+
+ :if ([ :len $FallbackTo ] < 1) do={
+ $LogPrint error $ScriptName ("There is no inactive partition named '" . $FallbackToName . "'.");
+ :set PackagesUpdateBackupFailure true;
+ :error false;
+ }
:if ([ /partitions/get $ActiveRunning version ] != [ /partitions/get $FallbackTo version]) do={
:if ([ $ScriptFromTerminal $ScriptName ] = true) do={
- :put ("The partitions have different RouterOS versions. Copy over to '" . $FallbackTo . "'? [y/N]");
+ :put ("The partitions have different RouterOS versions. Copy over to '" . $FallbackToName . "'? [y/N]");
:if (([ /terminal/inkey timeout=60 ] % 32) = 25) do={
- :if ([ $CopyTo $ScriptName $FallbackTo ] = false) do={
+ :if ([ $CopyTo $ScriptName $FallbackTo $FallbackToName ] = false) do={
:set PackagesUpdateBackupFailure true;
:error false;
}
@@ -75,7 +83,7 @@
:local NumLatest [ $VersionToNum ($Update->"latest-version") ];
:if ($BackupPartitionCopyBeforeFeatureUpdate = true && $NumLatest > 0 && \
($NumInstalled & 0xffff0000) != ($NumLatest & 0xffff0000)) do={
- :if ([ $CopyTo $ScriptName $FallbackTo ] = false) do={
+ :if ([ $CopyTo $ScriptName $FallbackTo $FallbackToName ] = false) do={
:set PackagesUpdateBackupFailure true;
:error false;
}
@@ -89,10 +97,10 @@
"[ /partitions/get [ find where running ] name ] . \"'!\")");
/partitions/save-config-to $FallbackTo;
/system/scheduler/remove "running-from-backup-partition";
- $LogPrint info $ScriptName ("Saved configuration to partition '" . $FallbackTo . "'.");
+ $LogPrint info $ScriptName ("Saved configuration to partition '" . $FallbackToName . "'.");
} on-error={
/system/scheduler/remove [ find where name="running-from-backup-partition" ];
- $LogPrint error $ScriptName ("Failed saving configuration to partition '" . $FallbackTo . "'!");
+ $LogPrint error $ScriptName ("Failed saving configuration to partition '" . $FallbackToName . "'!");
:set PackagesUpdateBackupFailure true;
:error false;
}
diff --git a/capsman-download-packages.capsman.rsc b/capsman-download-packages.capsman.rsc
index f5695f4..4f9ab9d 100644
--- a/capsman-download-packages.capsman.rsc
+++ b/capsman-download-packages.capsman.rsc
@@ -73,9 +73,11 @@
}
:if ($Updated = true) do={
- :local Script ([ /system/script/find where source~"\n# provides: capsman-rolling-upgrade\n" ]->0);
- :if ([ :len $Script ] > 0) do={
- /system/script/run $Script;
+ :local Scripts [ /system/script/find where source~"\n# provides: capsman-rolling-upgrade.capsman\n" ];
+ :if ([ :len $Scripts ] > 0) do={
+ :foreach Script in=$Scripts do={
+ /system/script/run $Script;
+ }
} else={
/caps-man/remote-cap/upgrade [ find where version!=$InstalledVersion ];
}
diff --git a/capsman-download-packages.template.rsc b/capsman-download-packages.template.rsc
index 762dbb6..c0e815b 100644
--- a/capsman-download-packages.template.rsc
+++ b/capsman-download-packages.template.rsc
@@ -83,9 +83,11 @@
}
:if ($Updated = true) do={
- :local Script ([ /system/script/find where source~"\n# provides: capsman-rolling-upgrade\n" ]->0);
- :if ([ :len $Script ] > 0) do={
- /system/script/run $Script;
+ :local Scripts [ /system/script/find where source~"\n# provides: capsman-rolling-upgrade%TEMPL%\n" ];
+ :if ([ :len $Scripts ] > 0) do={
+ :foreach Script in=$Scripts do={
+ /system/script/run $Script;
+ }
} else={
/caps-man/remote-cap/upgrade [ find where version!=$InstalledVersion ];
/interface/wifi/capsman/remote-cap/upgrade [ find where version!=$InstalledVersion ];
diff --git a/capsman-download-packages.wifi.rsc b/capsman-download-packages.wifi.rsc
index 79aa9a7..64ac7cd 100644
--- a/capsman-download-packages.wifi.rsc
+++ b/capsman-download-packages.wifi.rsc
@@ -75,9 +75,11 @@
}
:if ($Updated = true) do={
- :local Script ([ /system/script/find where source~"\n# provides: capsman-rolling-upgrade\n" ]->0);
- :if ([ :len $Script ] > 0) do={
- /system/script/run $Script;
+ :local Scripts [ /system/script/find where source~"\n# provides: capsman-rolling-upgrade.wifi\n" ];
+ :if ([ :len $Scripts ] > 0) do={
+ :foreach Script in=$Scripts do={
+ /system/script/run $Script;
+ }
} else={
/interface/wifi/capsman/remote-cap/upgrade [ find where version!=$InstalledVersion ];
}
diff --git a/capsman-rolling-upgrade.capsman.rsc b/capsman-rolling-upgrade.capsman.rsc
index 2c9ae3d..e9ca5cc 100644
--- a/capsman-rolling-upgrade.capsman.rsc
+++ b/capsman-rolling-upgrade.capsman.rsc
@@ -4,7 +4,7 @@
# Michael Gisbers <michael@gisbers.de>
# https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
#
-# provides: capsman-rolling-upgrade
+# provides: capsman-rolling-upgrade.capsman
# requires RouterOS, version=7.13
#
# upgrade CAPs one after another
diff --git a/capsman-rolling-upgrade.template.rsc b/capsman-rolling-upgrade.template.rsc
index 2098bc0..a28d7f7 100644
--- a/capsman-rolling-upgrade.template.rsc
+++ b/capsman-rolling-upgrade.template.rsc
@@ -4,7 +4,7 @@
# Michael Gisbers <michael@gisbers.de>
# https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
#
-# provides: capsman-rolling-upgrade
+# provides: capsman-rolling-upgrade%TEMPL%
# requires RouterOS, version=7.13
#
# upgrade CAPs one after another
diff --git a/capsman-rolling-upgrade.wifi.rsc b/capsman-rolling-upgrade.wifi.rsc
index 36b8c0f..22f8818 100644
--- a/capsman-rolling-upgrade.wifi.rsc
+++ b/capsman-rolling-upgrade.wifi.rsc
@@ -4,7 +4,7 @@
# Michael Gisbers <michael@gisbers.de>
# https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
#
-# provides: capsman-rolling-upgrade
+# provides: capsman-rolling-upgrade.wifi
# requires RouterOS, version=7.13
#
# upgrade CAPs one after another
diff --git a/global-functions.rsc b/global-functions.rsc
index 121c5ec..44b3abe 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -829,7 +829,12 @@
:global LogPrint;
:global WaitForFile;
- :if ([ :len [ /disk/find where slot=tmpfs type=tmpfs ] ] = 1) do={
+ :local TmpFs [ /disk/find where slot=tmpfs type=tmpfs ];
+ :if ([ :len $TmpFs ] = 1) do={
+ :if ([ /disk/get $TmpFs disabled ] = true) do={
+ $LogPrint info $0 ("The tmpfs is disabled, enabling.");
+ /disk/enable $TmpFs;
+ }
:return true;
}
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-14 00:20:48 +0000