From 502910cb7ac371bfd0d28d5f1e3c9bec0f2d332c Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil@baturin.org>
Date: Fri, 6 Sep 2019 19:21:23 +0200
Subject: T1616: fix DHCPv6 script behaviour in op mode.

---
 scripts/vyatta-dhcpv6-client.pl | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/scripts/vyatta-dhcpv6-client.pl b/scripts/vyatta-dhcpv6-client.pl
index 64c6840d..b78d40b5 100755
--- a/scripts/vyatta-dhcpv6-client.pl
+++ b/scripts/vyatta-dhcpv6-client.pl
@@ -57,8 +57,14 @@ sub gen_conf_file {
     my $config = new Vyatta::Config;
     $config->setLevel($level);
 
-    if ($config->exists('duid')) { 
-        my $duid = $config->returnValue('duid');
+    my $duid = '';
+    if($config->inSession()) {
+        $duid = $config->returnValue('duid');
+    } else {
+        $duid = $config->returnEffectiveValue('duid');
+    }
+
+    if($duid) {
         print $FD_WR "        send dhcp6.client-id $duid;\n";
     }
 #    my $hostname = hostname;
-- 
cgit v1.2.3