From 8e2c783068829c523c3b8fa8835f77f3a6ef56e0 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Thu, 15 Jul 2021 12:47:05 +0200 Subject: lease-script: drop differentiation of assign / deassign... ... not that we have early locking. --- lease-script | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'lease-script') diff --git a/lease-script b/lease-script index 3134cb6..6de6fd9 100644 --- a/lease-script +++ b/lease-script @@ -28,11 +28,10 @@ $ScriptLock $0 false 10; $LogPrintExit2 debug $0 ("More invocations are waiting, exiting early.") true; } -:local State ([ $IfThenElse ($leaseBound = 0) "de" "" ] . "assign"); -:local RunOrder [ :toarray "" ]; +$LogPrintExit2 debug $0 ("DHCP Server " . $leaseServerName . " " . [ $IfThenElse ($leaseBound = 0) \ + "de" "" ] . "assigned lease " . $leaseActIP . " to " . $leaseActMAC) false; -$LogPrintExit2 debug $0 ("DHCP Server " . $leaseServerName . " " . \ - $State . "ed lease " . $leaseActIP . " to " . $leaseActMAC) false; +:local RunOrder [ :toarray "" ]; :foreach Script in=[ / system script find where source~("\n# provides: lease-script, ") ] do={ :local Name [ / system script get $Script name ]; @@ -42,9 +41,7 @@ $LogPrintExit2 debug $0 ("DHCP Server " . $leaseServerName . " " . \ :set Store [ :pick $Store 0 [ :find $Store "\n" ] ]; :set Store [ $ParseKeyValueStore $Store ]; - :if (($Store->$State) = true) do={ - :set ($RunOrder->($Store->"order")) $Name; - } + :set ($RunOrder->($Store->"order")) $Name; } :foreach Order,Script in=$RunOrder do={ -- cgit v1.2.3-54-g00ecf