From 26120456440b8a91bdb53b3a30fa068890b8ffc5 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 13 Apr 2026 17:33:43 +0200
Subject: [PATCH] ipv6-update: handle global variable $IPv6DHCPClientEnvVars...

... set by ipv6-dhcp-client-script.
---
 ipv6-update.rsc | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/ipv6-update.rsc b/ipv6-update.rsc
index fed6eadd..8d7081f3 100644
--- a/ipv6-update.rsc
+++ b/ipv6-update.rsc
@@ -15,14 +15,17 @@
       do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
+  :global EitherOr;
   :global LogPrint;
   :global ParseKeyValueStore;
   :global ScriptLock;
 
-  :local NaAddress $"na-address";
-  :local NaValid $"na-valid";
-  :local PdPrefix $"pd-prefix";
-  :local PdValid $"pd-valid";
+  :global IPv6DHCPClientEnvVars;
+
+  :local NaAddress [ $EitherOr $"na-address" ($IPv6DHCPClientEnvVars->"na-address") ];
+  :local NaValid [ $EitherOr $"na-valid" ($IPv6DHCPClientEnvVars->"na-valid") ];
+  :local PdPrefix [ $EitherOr $"pd-prefix" ($IPv6DHCPClientEnvVars->"pd-prefix") ];
+  :local PdValid [ $EitherOr $"pd-valid" ($IPv6DHCPClientEnvVars->"pd-valid") ];
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
     :exit;