1 files changed, 28 insertions, 12 deletions
diff --git a/backup-partition.rsc b/backup-partition.rsc
index 3c883f7..56738ba 100644
--- a/backup-partition.rsc
+++ b/backup-partition.rsc
@@ -4,7 +4,7 @@
 # https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
 #
 # provides: backup-script, order=70
-# requires RouterOS, version=7.13
+# requires RouterOS, version=7.14
 #
 # save configuration to fallback partition
 # https://git.eworm.de/cgit/routeros-scripts/about/doc/backup-partition.md
@@ -19,22 +19,24 @@
   :global PackagesUpdateBackupFailure;
 
   :global LogPrint;
+  :global RequiredRouterOS;
   :global ScriptFromTerminal;
   :global ScriptLock;
   :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 +60,26 @@
     :error false;
   }
 
-  :local FallbackTo [ /partitions/get $ActiveRunning fallback-to ];
+  :if ([ $RequiredRouterOS $ScriptName "7.17beta2" false ] = true && \
+       ([ /system/device-mode/get ]->"partitions") != true) do={
+    $LogPrint warning $ScriptName \
+        ("The device mode has locked switching partitions! You will need physical access!");
+  }
+
+  :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;
         }
@@ -73,9 +88,10 @@
       :local Update [ /system/package/update/get ];
       :local NumInstalled [ $VersionToNum ($Update->"installed-version") ];
       :local NumLatest [ $VersionToNum ($Update->"latest-version") ];
+      :local BitMask [ $VersionToNum "255.255zero0" ];
       :if ($BackupPartitionCopyBeforeFeatureUpdate = true && $NumLatest > 0 && \
-           ($NumInstalled & 0xffff0000) != ($NumLatest & 0xffff0000)) do={
-        :if ([ $CopyTo $ScriptName $FallbackTo ] = false) do={
+           ($NumInstalled & $BitMask) != ($NumLatest & $BitMask)) do={
+        :if ([ $CopyTo $ScriptName $FallbackTo $FallbackToName ] = false) do={
           :set PackagesUpdateBackupFailure true;
           :error false;
         }
@@ -89,10 +105,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;
   }