Merge branch 'ros-v7-path-syntax' into next

1 files changed, 15 insertions, 15 deletions

diff --git a/ipv6-update b/ipv6-update
index 742a7cf..b81a0ec 100644
--- a/ipv6-update
+++ b/ipv6-update
@@ -19,44 +19,44 @@
   $LogPrintExit2 error $0 ("This script is supposed to run from ipv6 dhcp-client.") true;
 }
 
-:local Pool [ / ipv6 pool get [ find where prefix=$PdPrefix ] name ];
-:if ([ :len [ / ipv6 firewall address-list find where comment=("ipv6-pool-" . $Pool) ] ] = 0) do={
-  / ipv6 firewall address-list add list=("ipv6-pool-" . $Pool) address=:: comment=("ipv6-pool-" . $Pool);
+:local Pool [ /ipv6/pool/get [ find where prefix=$PdPrefix ] name ];
+:if ([ :len [ /ipv6/firewall/address-list/find where comment=("ipv6-pool-" . $Pool) ] ] = 0) do={
+  /ipv6/firewall/address-list/add list=("ipv6-pool-" . $Pool) address=:: comment=("ipv6-pool-" . $Pool);
   $LogPrintExit2 warning $0 ("Added ipv6 address list entry for ipv6-pool-" . $Pool) false;
 }
-:local AddrList [ / ipv6 firewall address-list find where comment=("ipv6-pool-" . $Pool) ];
-:local OldPrefix [ / ipv6 firewall address-list get ($AddrList->0) address ];
+:local AddrList [ /ipv6/firewall/address-list/find where comment=("ipv6-pool-" . $Pool) ];
+:local OldPrefix [ /ipv6/firewall/address-list/get ($AddrList->0) address ];
 
 :if ($OldPrefix != $PdPrefix) do={
   $LogPrintExit2 info $0 ("Updating IPv6 address list with new IPv6 prefix " . $PdPrefix) false;
-  / ipv6 firewall address-list set address=$PdPrefix $AddrList;
+  /ipv6/firewall/address-list/set address=$PdPrefix $AddrList;
 
   # give the interfaces a moment to receive their addresses
   :delay 2s;
 
-  :foreach ListEntry in=[ / ipv6 firewall address-list find where comment~("^ipv6-pool-" . $Pool . ",") ] do={
-    :local ListEntryVal [ / ipv6 firewall address-list get $ListEntry ];
+  :foreach ListEntry in=[ /ipv6/firewall/address-list/find where comment~("^ipv6-pool-" . $Pool . ",") ] do={
+    :local ListEntryVal [ /ipv6/firewall/address-list/get $ListEntry ];
     :local Comment [ $ParseKeyValueStore ($ListEntryVal->"comment") ];
 
-    :local Address [ / ipv6 address find where from-pool=$Pool interface=($Comment->"interface") ];
+    :local Address [ /ipv6/address/find where from-pool=$Pool interface=($Comment->"interface") ];
     :if ([ :len $Address ] = 1) do={
-      :set Address [ / ipv6 address get $Address address ];
+      :set Address [ /ipv6/address/get $Address address ];
       $LogPrintExit2 info $0 ("Updating IPv6 address list with new IPv6 prefix " . $Address . \
         " from interface " . ($Comment->"interface")) false;
-      / ipv6 firewall address-list set address=$Address $ListEntry;
+      /ipv6/firewall/address-list/set address=$Address $ListEntry;
     }
   }
 
-  :foreach Record in=[ / ip dns static find where comment~("^ipv6-pool-" . $Pool . ",") ] do={
-    :local RecordVal [ / ip dns static get $Record ];
+  :foreach Record in=[ /ip/dns/static/find where comment~("^ipv6-pool-" . $Pool . ",") ] do={
+    :local RecordVal [ /ip/dns/static/get $Record ];
     :local Comment [ $ParseKeyValueStore ($RecordVal->"comment") ];
 
-    :local Prefix [ / ipv6 address get [ find where interface=($Comment->"interface") from-pool=$Pool global ] address ];
+    :local Prefix [ /ipv6/address/get [ find where interface=($Comment->"interface") from-pool=$Pool global ] address ];
     :set Prefix ([ :toip6 [ :pick $Prefix 0 [ :find $Prefix "/64" ] ] ] & ffff:ffff:ffff:ffff::);
     :local Address ($Prefix | ([ :toip6 ($RecordVal->"address") ] & ::ffff:ffff:ffff:ffff));
 
     $LogPrintExit2 info $0 ("Updating DNS record for " . ($RecordVal->"name") . \
       ($RecordVal->"regexp") . " to " . $Address) false;
-    / ip dns static set address=$Address $Record;
+    /ip/dns/static/set address=$Address $Record;
   }
 }